[Bf-blender-cvs] [73c46431799] master: Cleanup: style
Campbell Barton
noreply at git.blender.org
Thu Dec 27 03:18:13 CET 2018
Commit: 73c46431799c85e83401e20cdc5816b3c76c1fd1
Author: Campbell Barton
Date: Thu Dec 27 13:14:37 2018 +1100
Branches: master
https://developer.blender.org/rB73c46431799c85e83401e20cdc5816b3c76c1fd1
Cleanup: style
===================================================================
M source/blender/depsgraph/intern/depsgraph.cc
M source/blender/depsgraph/intern/depsgraph_query_iter.cc
M source/blender/draw/engines/workbench/workbench_deferred.c
M source/blender/editors/transform/transform_conversions.c
===================================================================
diff --git a/source/blender/depsgraph/intern/depsgraph.cc b/source/blender/depsgraph/intern/depsgraph.cc
index 006e246e287..2982225bc3a 100644
--- a/source/blender/depsgraph/intern/depsgraph.cc
+++ b/source/blender/depsgraph/intern/depsgraph.cc
@@ -152,7 +152,8 @@ static bool pointer_to_component_node_criteria(
*subdata = pchan->name;
/* But B-Bone properties should connect to the actual operation. */
if (!ELEM(NULL, pchan->bone, prop) && pchan->bone->segments > 1 &&
- STRPREFIX(RNA_property_identifier(prop), "bbone_")) {
+ STRPREFIX(RNA_property_identifier(prop), "bbone_"))
+ {
*operation_code = DEG_OPCODE_BONE_SEGMENTS;
}
}
diff --git a/source/blender/depsgraph/intern/depsgraph_query_iter.cc b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
index 88dc74419e5..5b039ce60be 100644
--- a/source/blender/depsgraph/intern/depsgraph_query_iter.cc
+++ b/source/blender/depsgraph/intern/depsgraph_query_iter.cc
@@ -225,7 +225,7 @@ void deg_iterator_objects_step(BLI_Iterator *iter, DEG::IDDepsNode *id_node)
if (ob_visibility & OB_VISIBLE_INSTANCES) {
if ((data->flag & DEG_ITER_OBJECT_FLAG_DUPLI) &&
- (object->transflag & OB_DUPLI))
+ (object->transflag & OB_DUPLI))
{
data->dupli_parent = object;
data->dupli_list = object_duplilist(data->graph, data->scene, object);
diff --git a/source/blender/draw/engines/workbench/workbench_deferred.c b/source/blender/draw/engines/workbench/workbench_deferred.c
index 2096d31659d..2aa588802e7 100644
--- a/source/blender/draw/engines/workbench/workbench_deferred.c
+++ b/source/blender/draw/engines/workbench/workbench_deferred.c
@@ -839,7 +839,8 @@ void workbench_deferred_solid_cache_populate(WORKBENCH_Data *vedata, Object *ob)
}
}
else if (ELEM(wpd->shading.color_type,
- V3D_SHADING_SINGLE_COLOR, V3D_SHADING_OBJECT_COLOR, V3D_SHADING_RANDOM_COLOR)) {
+ V3D_SHADING_SINGLE_COLOR, V3D_SHADING_OBJECT_COLOR, V3D_SHADING_RANDOM_COLOR))
+ {
/* Draw solid color */
material = get_or_create_material_data(vedata, ob, NULL, NULL, wpd->shading.color_type);
if (is_sculpt_mode) {
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 8c3187d92a0..1d63291d313 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -8449,7 +8449,7 @@ static void createTransGPencil(bContext *C, TransInfo *t)
/* only copy center in local origins.
* This allows get interesting effects also when move using proportional editing */
if ((gps->flag & GP_STROKE_SELECT) &&
- (ts->transform_pivot_point == V3D_AROUND_LOCAL_ORIGINS))
+ (ts->transform_pivot_point == V3D_AROUND_LOCAL_ORIGINS))
{
copy_v3_v3(td->center, center);
}
More information about the Bf-blender-cvs
mailing list