archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: spelling

Browse Source
This commit is contained in:
Campbell Barton
2021-05-27 17:02:44 +10:00
parent 2ad3a1c318
commit f0342065b1
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2688,7 +2688,7 @@ void BKE_gpencil_visible_stroke_iter(ViewLayer *view_layer,
* This is used only in final render and never in Viewport. */ * This is used only in final render and never in Viewport. */
if ((view_layer != NULL) && (gpl->viewlayername[0] != '\0') && if ((view_layer != NULL) && (gpl->viewlayername[0] != '\0') &&
(!STREQ(view_layer->name, gpl->viewlayername))) { (!STREQ(view_layer->name, gpl->viewlayername))) {
/* Do not skip masks when rendering the viewlayer so that it can still be used to clip /* Do not skip masks when rendering the view-layer so that it can still be used to clip
* other layers. Instead set their opacity to zero. */ * other layers. Instead set their opacity to zero. */
if (gpencil_is_layer_mask(view_layer, gpd, gpl)) { if (gpencil_is_layer_mask(view_layer, gpd, gpl)) {
gpl->opacity = 0.0f; gpl->opacity = 0.0f;

8
source/blender/blenkernel/intern/lib_override.c
View File

@@ -357,9 +357,9 @@ bool BKE_lib_override_library_create_from_tag(Main *bmain,
/* If `newid` is already set, assume it has been handled by calling code. /* If `newid` is already set, assume it has been handled by calling code.
* Only current use case: re-using proxy ID when converting to liboverride. */ * Only current use case: re-using proxy ID when converting to liboverride. */
if (reference_id->newid == NULL) { if (reference_id->newid == NULL) {
/* Note: `no main` case is used during resync procedure, to support recursive resync. This /* Note: `no main` case is used during resync procedure, to support recursive resync.
* requires extra care further odwn the resync process, see * This requires extra care further down the resync process,
* `BKE_lib_override_library_resync`. */ * see: #BKE_lib_override_library_resync. */
reference_id->newid = lib_override_library_create_from( reference_id->newid = lib_override_library_create_from(
bmain, reference_id, do_no_main ? LIB_ID_CREATE_NO_MAIN : 0); bmain, reference_id, do_no_main ? LIB_ID_CREATE_NO_MAIN : 0);
if (reference_id->newid == NULL) { if (reference_id->newid == NULL) {
@@ -408,7 +408,7 @@ bool BKE_lib_override_library_create_from_tag(Main *bmain,
* loop, but we can get to them through their reference's `newid` pointer. */ * loop, but we can get to them through their reference's `newid` pointer. */
if (do_no_main && id->lib == reference_id->lib && id->newid != NULL) { if (do_no_main && id->lib == reference_id->lib && id->newid != NULL) {
other_id = id->newid; other_id = id->newid;
/* Otherwise we cannot properly dinstinguish between IDs that are actually from the /* Otherwise we cannot properly distinguish between IDs that are actually from the
* linked library (and should not be remapped), and IDs that are overrides re-generated * linked library (and should not be remapped), and IDs that are overrides re-generated
* from the reference from the linked library, and must therefore be remapped. * from the reference from the linked library, and must therefore be remapped.
* *

2
source/blender/blenlib/BLI_color.hh
View File

@@ -157,7 +157,7 @@ template<eAlpha Alpha> class ColorSceneLinear4f;
template<eAlpha Alpha> class ColorSceneLinearByteEncoded4b; template<eAlpha Alpha> class ColorSceneLinearByteEncoded4b;
template<typename ChannelStorageType> class ColorTheme4; template<typename ChannelStorageType> class ColorTheme4;
/* Forward declation of precision conversion methods. */ /* Forward declaration of precision conversion methods. */
BLI_INLINE ColorTheme4<float> BLI_color_convert_to_theme4f(const ColorTheme4<uint8_t> &srgb4b); BLI_INLINE ColorTheme4<float> BLI_color_convert_to_theme4f(const ColorTheme4<uint8_t> &srgb4b);
BLI_INLINE ColorTheme4<uint8_t> BLI_color_convert_to_theme4b(const ColorTheme4<float> &srgb4f); BLI_INLINE ColorTheme4<uint8_t> BLI_color_convert_to_theme4b(const ColorTheme4<float> &srgb4f);