1berry/blender
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup: spelling

Browse Source 
Includes fixes to misspelled function names.

Ref D11280
This commit is contained in:
Leon Zandman 2021-05-21 22:19:46 +10:00 committed by Campbell Barton
parent cf42586737
commit 865d1889da
35 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/build_environment/cmake/blosc.cmake
View File

@ -29,7 +29,7 @@ set(BLOSC_EXTRA_ARGS
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
)
# Prevent blosc from including it's own local copy of zlib in the object file
# Prevent blosc from including its own local copy of zlib in the object file
# and cause linker errors with everybody else.
set(BLOSC_EXTRA_ARGS ${BLOSC_EXTRA_ARGS}
-DPREFER_EXTERNAL_ZLIB=ON

2
build_files/build_environment/install_deps.sh
View File

@ -37,7 +37,7 @@ if [ $USE_DEBUG_TRAP -ne 0 ]; then
trap 'err_report $LINENO' ERR
fi
# Noisy, show every line that runs with it's line number.
# Noisy, show every line that runs with its line number.
if [ $USE_DEBUG_LOG -ne 0 ]; then
PS4='\e[0;33m$(printf %4d ${LINENO}):\e\033[0m '
set -x

2
build_files/build_environment/patches/cmake/modules/FindIlmBase.cmake
View File

@ -20,7 +20,7 @@
# ILMBASE_LIBRARIES - list of libraries to link against when using IlmBase.
# ILMBASE_FOUND - True if IlmBase was found.
# Other standarnd issue macros
# Other standard issue macros
include(FindPackageHandleStandardArgs)
include(FindPackageMessage)
include(SelectLibraryConfigurations)

2
build_files/build_environment/patches/cmake/modules/FindOpenEXR.cmake
View File

@ -22,7 +22,7 @@
# These are defined by the FindIlmBase module.
# OPENEXR_FOUND - True if OpenEXR was found.
# Other standarnd issue macros
# Other standard issue macros
include(SelectLibraryConfigurations)
include(FindPackageHandleStandardArgs)
include(FindPackageMessage)

2
build_files/cmake/buildinfo.cmake
View File

@ -79,7 +79,7 @@ if(EXISTS ${SOURCE_DIR}/.git)
ERROR_QUIET)
if(NOT _git_below_check STREQUAL "")
# If there're commits between HEAD and upstream this means
# that we're reset-ed to older revision. Use it's hash then.
# that we're reset-ed to older revision. Use its hash then.
execute_process(COMMAND git rev-parse --short=12 HEAD
WORKING_DIRECTORY ${SOURCE_DIR}
OUTPUT_VARIABLE MY_WC_HASH

2
intern/cycles/kernel/shaders/node_noise_texture.osl
View File

@ -25,7 +25,7 @@
* coordinates to act as a seed since the noise functions don't have seed values.
* A seed value is needed for generating distortion textures and color outputs.
* The offset's components are in the range [100, 200], not too high to cause
* bad precision and not to small to be noticeable. We use float seed because
* bad precision and not too small to be noticeable. We use float seed because
* OSL only support float hashes.
*/

2
intern/cycles/kernel/svm/svm_noisetex.h
View File

@ -20,7 +20,7 @@ CCL_NAMESPACE_BEGIN
* coordinates to act as a seed since the noise functions don't have seed values.
* A seed value is needed for generating distortion textures and color outputs.
* The offset's components are in the range [100, 200], not too high to cause
* bad precision and not to small to be noticeable. We use float seed because
* bad precision and not too small to be noticeable. We use float seed because
* OSL only support float hashes.
*/

2
intern/itasc/kdl/frames.hpp
View File

@ -364,7 +364,7 @@ public:
//! Along an arbitrary axes. It is not necessary to normalize rotaxis.
//! returns identity rotation matrix in the case that the norm of rotaxis
//! is to small to be used.
//! is too small to be used.
// @see Rot2 if you want to handle this error in another way.
static Rotation Rot(const Vector& rotaxis,double angle);

2
intern/itasc/kdl/utilities/error.h
View File

@ -161,7 +161,7 @@ class Error_MotionPlanning : public Error {};
class Error_MotionPlanning_Circle_ToSmall : public Error_MotionPlanning {
public:
virtual const char* Description() const { return "Circle : radius is to small";}
virtual const char* Description() const { return "Circle : radius is too small";}
virtual int GetType() const {return 3001;}
};

2
release/scripts/freestyle/styles/ignore_small_occlusions.py
View File

@ -16,7 +16,7 @@
#
# ##### END GPL LICENSE BLOCK #####
# Filename : ignore_small_oclusions.py
# Filename : ignore_small_occlusions.py
# Author : Stephane Grabli
# Date : 04/08/2005
# Purpose : The strokes are drawn through small occlusions

2
release/scripts/modules/rna_keymap_ui.py
View File

@ -421,7 +421,7 @@ def draw_keymaps(context, layout):
rowsubsub.prop(spref, "filter_text", text="", icon='VIEWZOOM')
if not filter_text:
# When the keyconfig defines it's own preferences.
# When the keyconfig defines its own preferences.
kc_prefs = kc_active.preferences
if kc_prefs is not None:
box = col.box()

2
release/scripts/templates_py/gizmo_custom_geometry.py
View File

@ -1,4 +1,4 @@
# Example of a custom widget that defines it's own geometry.
# Example of a custom widget that defines its own geometry.
#
# Usage: Select a light in the 3D view and drag the arrow at it's rear
# to change it's energy value.

2
source/blender/blenkernel/intern/mball_tessellate.c
View File

@ -1436,7 +1436,7 @@ void BKE_mball_polygonize(Depsgraph *depsgraph, Scene *scene, Object *ob, ListBa
if (process.totelem > 0) {
build_bvh_spatial(&process, &process.metaball_bvh, 0, process.totelem, &process.allbb);
/* Don't polygonize meta-balls with too high resolution (base mball to small)
/* Don't polygonize meta-balls with too high resolution (base mball too small)
* note: Eps was 0.0001f but this was giving problems for blood animation for
* the open movie "Sintel", using 0.00001f. */
if (ob->scale[0] > 0.00001f * (process.allbb.max[0] - process.allbb.min[0]) ||

2
source/blender/blenlib/intern/math_geom.c
View File

@ -2353,7 +2353,7 @@ bool isect_planes_v3_fn(
for (i_test = 0; i_test < planes_len; i_test++) {
const float *np_test = planes[i_test];
if (((dot_v3v3(np_test, co_test) + np_test[3]) > eps_isect)) {
/* For low epsilon values the point could intersect it's own plane. */
/* For low epsilon values the point could intersect its own plane. */
if (!ELEM(i_test, i, j, k)) {
break;
}

2
source/blender/blenlib/intern/math_vector.c
View File

@ -412,7 +412,7 @@ bool is_finite_v4(const float v[4])
* this would return the angle at the elbow.
*
* note that when v1/v2/v3 represent 3 points along a straight line
* that the angle returned will be pi (180deg), rather then 0.0
* that the angle returned will be pi (180deg), rather than 0.0
*/
float angle_v3v3v3(const float a[3], const float b[3], const float c[3])
{

2
source/blender/editors/animation/anim_channels_defines.c
View File

@ -4674,7 +4674,7 @@ static void achannel_setting_flush_widget_cb(bContext *C, void *ale_npoin, void
DEG_id_tag_update(ale_setting->id, ID_RECALC_ANIMATION);
}
if (ale_setting->adt && ale_setting->adt->action) {
/* Action is it's own datablock, so has to be tagged specifically. */
/* Action is its own datablock, so has to be tagged specifically. */
DEG_id_tag_update(&ale_setting->adt->action->id, ID_RECALC_ANIMATION);
}

2
source/blender/editors/interface/view2d_ops.c
View File

@ -757,7 +757,7 @@ typedef struct v2dViewZoomData {
} v2dViewZoomData;
/**
* Clamp by convention rather then locking flags,
* Clamp by convention rather than locking flags,
* for ndof and +/- keys
*/
static void view_zoom_axis_lock_defaults(bContext *C, bool r_do_zoom_xy[2])

4
source/blender/editors/screen/area.c
View File

@ -1527,8 +1527,8 @@ static void region_rect_recursive(
BLI_rcti_init(remainder, 0, 0, 0, 0);
}
/* Fix any negative dimensions. This can happen when a quad split 3d view gets to small. (see
* T72200). */
/* Fix any negative dimensions. This can happen when a quad split 3d view gets too small.
* (see T72200). */
BLI_rcti_sanitize(&region->winrct);
quad++;

2
source/blender/editors/space_outliner/outliner_draw.c
View File

@ -2106,7 +2106,7 @@ static void outliner_draw_mode_column_toggle(uiBlock *block,
tip);
UI_but_func_set(but, outliner_mode_toggle_fn, tselem, NULL);
UI_but_flag_enable(but, UI_BUT_DRAG_LOCK);
/* Mode toggling handles it's own undo state because undo steps need to be grouped. */
/* Mode toggling handles its own undo state because undo steps need to be grouped. */
UI_but_flag_disable(but, UI_BUT_UNDO);
if (ID_IS_LINKED(&ob->id)) {

4
source/blender/editors/space_view3d/view3d_placement.c
View File

@ -252,7 +252,7 @@ static int dot_v3_array_find_max_index(const float dirs[][3],
}
/**
* Re-order \a mat so \a axis_align uses it's own axis which is closest to \a v.
* Re-order \a mat so \a axis_align uses its own axis which is closest to \a v.
*/
static bool mat3_align_axis_to_v3(float mat[3][3], const int axis_align, const float v[3])
{
@ -1762,7 +1762,7 @@ static void WIDGETGROUP_placement_setup(const bContext *UNUSED(C), wmGizmoGroup
gizmo->flag |= WM_GIZMO_HIDDEN_KEYMAP;
}
/* Sets the gizmos custom-data which has it's own free callback. */
/* Sets the gizmos custom-data which has its own free callback. */
preview_plane_cursor_setup(gzgroup);
}

4
source/blender/editors/transform/transform.h
View File

@ -430,14 +430,14 @@ typedef struct TransCustomDataContainer {
/**
* Container for Transform Data
*
* Used to implement multi-object modes, so each object can have it's
* Used to implement multi-object modes, so each object can have its
* own data array as well as object matrix, local center etc.
*
* Anything that can't be shared between all objects
* and doesn't make sense to store for every vertex (in the #TransDataContainer.data).
*
* \note at some point this could be used to store non object containers
* although this only makes sense if each container has it's own matrices,
* although this only makes sense if each container has its own matrices,
* otherwise all elements may as well be stored in one array (#TransDataContainer.data),
* as is already done for curve-objects, f-curves. etc.
*/

6
source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
View File

@ -74,7 +74,7 @@ static LineartEdge *lineart_line_get_connected(LineartBoundingArea *ba,
static LineartLineChain *lineart_chain_create(LineartRenderBuffer *rb)
{
LineartLineChain *rlc;
rlc = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineChain));
rlc = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineChain));
BLI_addtail(&rb->chains, rlc);
@ -119,7 +119,7 @@ static LineartLineChainItem *lineart_chain_append_point(LineartRenderBuffer *rb,
return old_rlci;
}
rlci = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineChainItem));
rlci = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineChainItem));
copy_v2_v2(rlci->pos, fbcoord);
copy_v3_v3(rlci->gpos, gpos);
@ -149,7 +149,7 @@ static LineartLineChainItem *lineart_chain_prepend_point(LineartRenderBuffer *rb
return rlc->chain.first;
}
rlci = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineChainItem));
rlci = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineChainItem));
copy_v2_v2(rlci->pos, fbcoord);
copy_v3_v3(rlci->gpos, gpos);

40
source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
View File

@ -134,8 +134,8 @@ static LineartLineSegment *lineart_give_segment(LineartRenderBuffer *rb)
BLI_spin_unlock(&rb->lock_cuts);
/* Otherwise allocate some new memory. */
return (LineartLineSegment *)lineart_mem_aquire_thread(&rb->render_data_pool,
sizeof(LineartLineSegment));
return (LineartLineSegment *)lineart_mem_acquire_thread(&rb->render_data_pool,
sizeof(LineartLineSegment));
}
/**
@ -631,8 +631,8 @@ static LineartElementLinkNode *lineart_memory_get_triangle_space(LineartRenderBu
/* We don't need to allocate a whole bunch of triangles because the amount of clipped triangles
* are relatively small. */
LineartTriangle *render_triangles = lineart_mem_aquire(&rb->render_data_pool,
64 * rb->triangle_size);
LineartTriangle *render_triangles = lineart_mem_acquire(&rb->render_data_pool,
64 * rb->triangle_size);
reln = lineart_list_append_pointer_pool_sized(&rb->triangle_buffer_pointers,
&rb->render_data_pool,
@ -648,8 +648,8 @@ static LineartElementLinkNode *lineart_memory_get_vert_space(LineartRenderBuffer
{
LineartElementLinkNode *reln;
LineartVert *render_vertices = lineart_mem_aquire(&rb->render_data_pool,
sizeof(LineartVert) * 64);
LineartVert *render_vertices = lineart_mem_acquire(&rb->render_data_pool,
sizeof(LineartVert) * 64);
reln = lineart_list_append_pointer_pool_sized(&rb->vertex_buffer_pointers,
&rb->render_data_pool,
@ -665,7 +665,7 @@ static LineartElementLinkNode *lineart_memory_get_edge_space(LineartRenderBuffer
{
LineartElementLinkNode *reln;
LineartEdge *render_edges = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge) * 64);
LineartEdge *render_edges = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge) * 64);
reln = lineart_list_append_pointer_pool_sized(&rb->line_buffer_pointers,
&rb->render_data_pool,
@ -755,7 +755,7 @@ static void lineart_triangle_cull_single(LineartRenderBuffer *rb,
e = new_e; \
e->v1_obindex = v1_obi; \
e->v2_obindex = v2_obi; \
rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineSegment)); \
rls = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineSegment)); \
BLI_addtail(&e->segments, rls);
#define SELECT_RL(e_num, v1_link, v2_link, newrt) \
@ -1576,8 +1576,8 @@ static void lineart_geometry_object_load(Depsgraph *dg,
/* Only allocate memory for verts and tris as we don't know how many lines we will generate
* yet. */
orv = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartVert) * bm->totvert);
ort = lineart_mem_aquire(&rb->render_data_pool, bm->totface * rb->triangle_size);
orv = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartVert) * bm->totvert);
ort = lineart_mem_acquire(&rb->render_data_pool, bm->totface * rb->triangle_size);
orig_ob = ob->id.orig_id ? (Object *)ob->id.orig_id : ob;
@ -1675,7 +1675,7 @@ static void lineart_geometry_object_load(Depsgraph *dg,
e->head.hflag = eflag;
}
o_la_e = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge) * allocate_la_e);
o_la_e = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge) * allocate_la_e);
reln = lineart_list_append_pointer_pool_sized(
&rb->line_buffer_pointers, &rb->render_data_pool, o_la_e, sizeof(LineartElementLinkNode));
reln->element_count = allocate_la_e;
@ -1707,8 +1707,8 @@ static void lineart_geometry_object_load(Depsgraph *dg,
la_e->flags = e->head.hflag;
la_e->object_ref = orig_ob;
LineartLineSegment *rls = lineart_mem_aquire(&rb->render_data_pool,
sizeof(LineartLineSegment));
LineartLineSegment *rls = lineart_mem_acquire(&rb->render_data_pool,
sizeof(LineartLineSegment));
BLI_addtail(&la_e->segments, rls);
if (ELEM(usage, OBJECT_LRT_INHERIT, OBJECT_LRT_INCLUDE, OBJECT_LRT_NO_INTERSECTION)) {
lineart_add_edge_to_list(rb, la_e);
@ -2344,7 +2344,7 @@ static LineartVert *lineart_triangle_2v_intersection_test(LineartRenderBuffer *r
/* This is an intersection vert, the size is bigger than LineartVert,
* allocated separately. */
result = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartVertIntersection));
result = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartVertIntersection));
/* Indicate the data structure difference. */
result->flag = LRT_VERT_HAS_INTERSECTION_DATA;
@ -2388,7 +2388,7 @@ static LineartEdge *lineart_triangle_intersect(LineartRenderBuffer *rb,
LineartVert *new_share;
lineart_triangle_get_other_verts(rt, share, &sv1, &sv2);
v1 = new_share = lineart_mem_aquire(&rb->render_data_pool, (sizeof(LineartVertIntersection)));
v1 = new_share = lineart_mem_acquire(&rb->render_data_pool, (sizeof(LineartVertIntersection)));
new_share->flag = LRT_VERT_HAS_INTERSECTION_DATA;
@ -2487,13 +2487,13 @@ static LineartEdge *lineart_triangle_intersect(LineartRenderBuffer *rb,
((LineartVertIntersection *)v1)->intersecting_with = rt;
((LineartVertIntersection *)v2)->intersecting_with = testing;
result = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartEdge));
result = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartEdge));
result->v1 = v1;
result->v2 = v2;
result->t1 = rt;
result->t2 = testing;
LineartLineSegment *rls = lineart_mem_aquire(&rb->render_data_pool, sizeof(LineartLineSegment));
LineartLineSegment *rls = lineart_mem_acquire(&rb->render_data_pool, sizeof(LineartLineSegment));
BLI_addtail(&result->segments, rls);
/* Don't need to OR flags right now, just a type mark. */
result->flags = LRT_EDGE_FLAG_INTERSECTION;
@ -2729,7 +2729,7 @@ static void lineart_main_bounding_area_make_initial(LineartRenderBuffer *rb)
rb->height_per_tile = span_h;
rb->bounding_area_count = sp_w * sp_h;
rb->initial_bounding_areas = lineart_mem_aquire(
rb->initial_bounding_areas = lineart_mem_acquire(
&rb->render_data_pool, sizeof(LineartBoundingArea) * rb->bounding_area_count);
/* Initialize tiles. */
@ -2923,8 +2923,8 @@ static void lineart_bounding_area_split(LineartRenderBuffer *rb,
LineartBoundingArea *root,
int recursive_level)
{
LineartBoundingArea *ba = lineart_mem_aquire(&rb->render_data_pool,
sizeof(LineartBoundingArea) * 4);
LineartBoundingArea *ba = lineart_mem_acquire(&rb->render_data_pool,
sizeof(LineartBoundingArea) * 4);
LineartTriangle *rt;
LineartEdge *e;

4
source/blender/gpencil_modifiers/intern/lineart/lineart_intern.h
View File

@ -54,8 +54,8 @@ void lineart_list_remove_pointer_item_no_free(ListBase *h, LinkData *lip);
struct LineartStaticMemPoolNode *lineart_mem_new_static_pool(struct LineartStaticMemPool *smp,
size_t size);
void *lineart_mem_aquire(struct LineartStaticMemPool *smp, size_t size);
void *lineart_mem_aquire_thread(struct LineartStaticMemPool *smp, size_t size);
void *lineart_mem_acquire(struct LineartStaticMemPool *smp, size_t size);
void *lineart_mem_acquire_thread(struct LineartStaticMemPool *smp, size_t size);
void lineart_mem_destroy(struct LineartStaticMemPool *smp);
void lineart_prepend_edge_direct(struct LineartEdge **first, void *node);

10
source/blender/gpencil_modifiers/intern/lineart/lineart_util.c
View File

@ -43,7 +43,7 @@ void *lineart_list_append_pointer_pool(ListBase *h, LineartStaticMemPool *smp, v
if (h == NULL) {
return 0;
}
lip = lineart_mem_aquire(smp, sizeof(LinkData));
lip = lineart_mem_acquire(smp, sizeof(LinkData));
lip->data = data;
BLI_addtail(h, lip);
return lip;
@ -57,7 +57,7 @@ void *lineart_list_append_pointer_pool_sized(ListBase *h,
if (h == NULL) {
return 0;
}
lip = lineart_mem_aquire(smp, size);
lip = lineart_mem_acquire(smp, size);
lip->data = data;
BLI_addtail(h, lip);
return lip;
@ -92,7 +92,7 @@ LineartStaticMemPoolNode *lineart_mem_new_static_pool(LineartStaticMemPool *smp,
BLI_addhead(&smp->pools, smpn);
return smpn;
}
void *lineart_mem_aquire(LineartStaticMemPool *smp, size_t size)
void *lineart_mem_acquire(LineartStaticMemPool *smp, size_t size)
{
LineartStaticMemPoolNode *smpn = smp->pools.first;
void *ret;
@ -107,7 +107,7 @@ void *lineart_mem_aquire(LineartStaticMemPool *smp, size_t size)
return ret;
}
void *lineart_mem_aquire_thread(LineartStaticMemPool *smp, size_t size)
void *lineart_mem_acquire_thread(LineartStaticMemPool *smp, size_t size)
{
void *ret;
@ -144,7 +144,7 @@ void lineart_prepend_edge_direct(LineartEdge **first, void *node)
void lineart_prepend_pool(LinkNode **first, LineartStaticMemPool *smp, void *link)
{
LinkNode *ln = lineart_mem_aquire_thread(smp, sizeof(LinkNode));
LinkNode *ln = lineart_mem_acquire_thread(smp, sizeof(LinkNode));
ln->next = (*first);
ln->link = link;
(*first) = ln;

2
source/blender/gpu/shaders/material/gpu_shader_material_tex_noise.glsl
View File

@ -2,7 +2,7 @@
* coordinates to act as a seed since the noise functions don't have seed values.
* A seed value is needed for generating distortion textures and color outputs.
* The offset's components are in the range [100, 200], not too high to cause
* bad precision and not to small to be noticeable. We use float seed because
* bad precision and not too small to be noticeable. We use float seed because
* OSL only support float hashes.
*/

6
source/blender/imbuf/IMB_colormanagement.h
View File

@ -69,9 +69,9 @@ bool IMB_colormanagement_space_name_is_data(const char *name);
BLI_INLINE float IMB_colormanagement_get_luminance(const float rgb[3]);
BLI_INLINE unsigned char IMB_colormanagement_get_luminance_byte(const unsigned char[3]);
BLI_INLINE void IMB_colormangement_xyz_to_rgb(float rgb[3], const float xyz[3]);
BLI_INLINE void IMB_colormangement_rgb_to_xyz(float xyz[3], const float rgb[3]);
const float *IMB_colormangement_get_xyz_to_rgb(void);
BLI_INLINE void IMB_colormanagement_xyz_to_rgb(float rgb[3], const float xyz[3]);
BLI_INLINE void IMB_colormanagement_rgb_to_xyz(float xyz[3], const float rgb[3]);
const float *IMB_colormanagement_get_xyz_to_rgb(void);
/* ** Color space transformation functions ** */
void IMB_colormanagement_transform(float *buffer,

2
source/blender/imbuf/intern/anim_movie.c
View File

@ -1123,7 +1123,7 @@ static void ffmpeg_decode_video_frame_scan(struct anim *anim, int64_t pts_to_sea
}
}
/* Wrapper over av_seek_frame(), for formats that doesn't have it's own read_seek() or read_seek2()
/* Wrapper over av_seek_frame(), for formats that doesn't have its own read_seek() or read_seek2()
* functions defined. When seeking in these formats, rule to seek to last necessary I-frame is not
* honored. It is not even guaranteed that I-frame, that must be decoded will be read. See
* https://trac.ffmpeg.org/ticket/1607 and https://developer.blender.org/T86944. */

2
source/blender/imbuf/intern/colormanagement.c
View File

@ -1409,7 +1409,7 @@ bool IMB_colormanagement_space_name_is_data(const char *name)
return (colorspace && colorspace->is_data);
}
const float *IMB_colormangement_get_xyz_to_rgb()
const float *IMB_colormanagement_get_xyz_to_rgb()
{
return &imbuf_xyz_to_rgb[0][0];
}

4
source/blender/imbuf/intern/colormanagement_inline.c
View File

@ -55,12 +55,12 @@ unsigned char IMB_colormanagement_get_luminance_byte(const unsigned char rgb[3])
return unit_float_to_uchar_clamp(val);
}
void IMB_colormangement_xyz_to_rgb(float rgb[3], const float xyz[3])
void IMB_colormanagement_xyz_to_rgb(float rgb[3], const float xyz[3])
{
mul_v3_m3v3(rgb, imbuf_xyz_to_rgb, xyz);
}
void IMB_colormangement_rgb_to_xyz(float xyz[3], const float rgb[3])
void IMB_colormanagement_rgb_to_xyz(float xyz[3], const float rgb[3])
{
mul_v3_m3v3(xyz, imbuf_rgb_to_xyz, rgb);
}

2
source/blender/imbuf/intern/util.c
View File

@ -182,7 +182,7 @@ bool IMB_ispic_type_matches(const char *filepath, int filetype)
const ImFileType *type = IMB_file_type_from_ftype(filetype);
if (type != NULL) {
/* Requesting to load a type that can't check it's own header doesn't make sense.
/* Requesting to load a type that can't check its own header doesn't make sense.
* Keep the check for developers. */
BLI_assert(type->is_a != NULL);
if (type->is_a != NULL) {

2
source/blender/nodes/shader/node_shader_util.c
View File

@ -335,7 +335,7 @@ void node_shader_gpu_tex_mapping(GPUMaterial *mat,
void get_XYZ_to_RGB_for_gpu(XYZ_to_RGB *data)
{
const float *xyz_to_rgb = IMB_colormangement_get_xyz_to_rgb();
const float *xyz_to_rgb = IMB_colormanagement_get_xyz_to_rgb();
data->r[0] = xyz_to_rgb[0];
data->r[1] = xyz_to_rgb[3];
data->r[2] = xyz_to_rgb[6];

2
source/blender/python/intern/bpy_interface.c
View File

@ -400,7 +400,7 @@ void BPY_python_start(bContext *C, int argc, const char **argv)
/* Needed for Python's initialization for portable Python installations.
* We could use #Py_SetPath, but this overrides Python's internal logic
* for calculating it's own module search paths.
* for calculating its own module search paths.
*
* `sys.executable` is overwritten after initialization to the Python binary. */
{

2
source/blender/sequencer/intern/render.c
View File

@ -1974,7 +1974,7 @@ static ImBuf *seq_render_strip_stack(const SeqRenderData *context,
/**
* \return The image buffer or NULL.
*
* \note The returned #ImBuf is has it's reference increased, free after usage!
* \note The returned #ImBuf has its reference increased, free after usage!
*/
ImBuf *SEQ_render_give_ibuf(const SeqRenderData *context, float timeline_frame, int chanshown)
{

2
source/creator/CMakeLists.txt
View File

@ -185,7 +185,7 @@ if(WITH_BUILDINFO)
# --------------------------------------------------------------------------
# write header for values that change each build
# note, generaed file is in build dir's source/creator
# note, generated file is in build dir's source/creator
# except when used as an include path.
add_definitions(-DWITH_BUILDINFO_HEADER)