[Bf-blender-cvs] [ae093e6a843] blender2.8: Cleanup: whitespace
Campbell Barton
noreply at git.blender.org
Wed Oct 17 05:09:01 CEST 2018
Commit: ae093e6a8439796d02676dca895efcf5bd378ba4
Author: Campbell Barton
Date: Wed Oct 17 14:08:44 2018 +1100
Branches: blender2.8
https://developer.blender.org/rBae093e6a8439796d02676dca895efcf5bd378ba4
Cleanup: whitespace
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.c
M source/blender/editors/animation/keyframes_draw.c
M source/blender/makesrna/intern/rna_modifier.c
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.c b/source/blender/draw/engines/gpencil/gpencil_engine.c
index b0e75b85c0b..f371de066a9 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.c
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.c
@@ -523,7 +523,7 @@ static void gpencil_add_draw_data(void *vedata, Object *ob)
/* FX passses */
cache_ob->has_fx = false;
if ((!stl->storage->simplify_fx) &&
- (BKE_shaderfx_has_gpencil(ob)))
+ (BKE_shaderfx_has_gpencil(ob)))
{
cache_ob->has_fx = true;
if ((!stl->storage->simplify_fx) && (!is_multiedit)) {
diff --git a/source/blender/editors/animation/keyframes_draw.c b/source/blender/editors/animation/keyframes_draw.c
index 9379ec2af39..ec9e1f29a72 100644
--- a/source/blender/editors/animation/keyframes_draw.c
+++ b/source/blender/editors/animation/keyframes_draw.c
@@ -67,11 +67,13 @@
/* ActKeyColumns (Keyframe Columns) ------------------------------------------ */
-BLI_INLINE bool is_cfra_eq(float a, float b) {
+BLI_INLINE bool is_cfra_eq(float a, float b)
+{
return IS_EQT(a, b, BEZT_BINARYSEARCH_THRESH);
}
-BLI_INLINE bool is_cfra_lt(float a, float b) {
+BLI_INLINE bool is_cfra_lt(float a, float b)
+{
return (b - a) > BEZT_BINARYSEARCH_THRESH;
}
@@ -255,7 +257,7 @@ static const ActKeyBlockInfo dummy_keyblock = { 0 };
static void compute_keyblock_data(ActKeyBlockInfo *info, BezTriple *prev, BezTriple *beztn)
{
- memset(info, 0, sizeof (ActKeyBlockInfo));
+ memset(info, 0, sizeof(ActKeyBlockInfo));
if (BEZKEYTYPE(beztn) == BEZT_KEYTYPE_MOVEHOLD) {
/* Animator tagged a "moving hold"
diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 5eef1614730..fccdb4e16a2 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -64,7 +64,7 @@
const EnumPropertyItem rna_enum_object_modifier_type_items[] = {
{0, "", 0, N_("Modify"), ""},
- {eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MOD_DATA_TRANSFER, "Data Transfer", ""},
+ {eModifierType_DataTransfer, "DATA_TRANSFER", ICON_MOD_DATA_TRANSFER, "Data Transfer", ""},
{eModifierType_MeshCache, "MESH_CACHE", ICON_MOD_MESHDEFORM, "Mesh Cache", ""},
{eModifierType_MeshSequenceCache, "MESH_SEQUENCE_CACHE", ICON_MOD_MESHDEFORM, "Mesh Sequence Cache", ""},
{eModifierType_NormalEdit, "NORMAL_EDIT", ICON_MOD_NORMALEDIT, "Normal Edit", ""},
More information about the Bf-blender-cvs
mailing list