diff options
| -rw-r--r-- | intern/cycles/blender/blender_object.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/render/alembic.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/GHOST_Types.h | 5 | ||||
| -rw-r--r-- | source/blender/draw/engines/gpencil/gpencil_shader_fx.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_region_menu_popup.c | 2 | ||||
| -rw-r--r-- | source/blender/gpu/intern/gpu_framebuffer_private.hh | 2 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/anim_movie.c | 2 |
7 files changed, 10 insertions, 7 deletions
diff --git a/intern/cycles/blender/blender_object.cpp b/intern/cycles/blender/blender_object.cpp index 619cdf98fa1..19f49acddd7 100644 --- a/intern/cycles/blender/blender_object.cpp +++ b/intern/cycles/blender/blender_object.cpp @@ -561,7 +561,7 @@ void BlenderSync::sync_objects(BL::Depsgraph &b_depsgraph, sync_background_light(b_v3d, use_portal); /* Handle removed data and modified pointers, as this may free memory, delete Nodes in the - * right order to ensure that dependant data is freed after their users. Objects should be + * right order to ensure that dependent data is freed after their users. Objects should be * freed before particle systems and geometries. */ light_map.post_sync(); object_map.post_sync(); diff --git a/intern/cycles/render/alembic.cpp b/intern/cycles/render/alembic.cpp index 0dda8785bb3..5842f4c313d 100644 --- a/intern/cycles/render/alembic.cpp +++ b/intern/cycles/render/alembic.cpp @@ -35,7 +35,7 @@ using namespace Alembic::AbcGeom; CCL_NAMESPACE_BEGIN -/* TODO(@kevindietrich): motion blur support */ +/* TODO(kevindietrich): motion blur support. */ template<typename SchemaType> static vector<FaceSetShaderIndexPair> parse_face_sets_for_shader_assignment( diff --git a/intern/ghost/GHOST_Types.h b/intern/ghost/GHOST_Types.h index bd7ba6657f0..7d819913efc 100644 --- a/intern/ghost/GHOST_Types.h +++ b/intern/ghost/GHOST_Types.h @@ -416,7 +416,10 @@ typedef enum { GHOST_kGrabNormal, /** Wrap the mouse location to prevent limiting screen bounds. */ GHOST_kGrabWrap, - /** Hide the mouse while grabbing and restore the original location on release (numbuts). */ + /** + * Hide the mouse while grabbing and restore the original location on release + * (used for number buttons and some other draggable UI elements). + */ GHOST_kGrabHide, } GHOST_TGrabCursorMode; diff --git a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c index ab90831f4ac..21d55357a2a 100644 --- a/source/blender/draw/engines/gpencil/gpencil_shader_fx.c +++ b/source/blender/draw/engines/gpencil/gpencil_shader_fx.c @@ -427,7 +427,7 @@ static void gpencil_vfx_glow(GlowShaderFxData *fx, Object *UNUSED(ob), gpIterVfx float ref_col[4]; if (fx->mode == eShaderFxGlowMode_Luminance) { - /* Only pass in the first value for luminace. */ + /* Only pass in the first value for luminance. */ ref_col[0] = fx->threshold; ref_col[1] = -1.0f; ref_col[2] = -1.0f; diff --git a/source/blender/editors/interface/interface_region_menu_popup.c b/source/blender/editors/interface/interface_region_menu_popup.c index 6906309fd30..58a74a3473e 100644 --- a/source/blender/editors/interface/interface_region_menu_popup.c +++ b/source/blender/editors/interface/interface_region_menu_popup.c @@ -403,7 +403,7 @@ uiPopupMenu *UI_popup_menu_begin_ex(bContext *C, pup->layout = UI_block_layout( pup->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_MENU, 0, 0, 200, 0, UI_MENU_PADDING, style); - /* note, this intentionally differs from the menu & submenu default because many operators + /* note, this intentionally differs from the menu & sub-menu default because many operators * use popups like this to select one of their options - * where having invoke doesn't make sense */ uiLayoutSetOperatorContext(pup->layout, WM_OP_EXEC_REGION_WIN); diff --git a/source/blender/gpu/intern/gpu_framebuffer_private.hh b/source/blender/gpu/intern/gpu_framebuffer_private.hh index ab4e22ebb80..2b00c239af4 100644 --- a/source/blender/gpu/intern/gpu_framebuffer_private.hh +++ b/source/blender/gpu/intern/gpu_framebuffer_private.hh @@ -111,7 +111,7 @@ class FrameBuffer { public: /* Reference of a pointer that needs to be cleaned when deallocating the frame-buffer. - * Points to BPyGPUFrameBuffer::fb */ + * Points to #BPyGPUFrameBuffer::fb */ void **ref = nullptr; public: diff --git a/source/blender/imbuf/intern/anim_movie.c b/source/blender/imbuf/intern/anim_movie.c index 96cd1fb61a4..432b62d172a 100644 --- a/source/blender/imbuf/intern/anim_movie.c +++ b/source/blender/imbuf/intern/anim_movie.c @@ -817,7 +817,7 @@ static void ffmpeg_postprocess(struct anim *anim) # if defined(__x86_64__) || defined(_M_X64) /* Scale and flip image over Y axis in one go, using negative strides. - * This doesn't work with arm/powerpc though and may be misusing the API. + * This doesn't work with ARM/PowerPC though and may be misusing the API. * Limit it x86_64 where it appears to work. * http://trac.ffmpeg.org/ticket/9060 */ int *dstStride = anim->pFrameRGB->linesize; |