[Bf-blender-cvs] [41a7dd383cc] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Wed Jan 23 23:27:32 CET 2019


Commit: 41a7dd383cc77566655a60e35e74ec1276d04020
Author: Campbell Barton
Date:   Thu Jan 24 09:27:14 2019 +1100
Branches: master
https://developer.blender.org/rB41a7dd383cc77566655a60e35e74ec1276d04020

Cleanup: style

===================================================================

M	release/scripts/startup/bl_ui/space_view3d_toolbar.py
M	source/blender/depsgraph/intern/builder/deg_builder_relations.cc
M	source/blender/editors/sculpt_paint/sculpt.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
index 2c95a9207ec..321e61ac092 100644
--- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py
+++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py
@@ -271,8 +271,9 @@ class VIEW3D_PT_tools_brush(Panel, View3DPaintPanel):
                 brush_basic_sculpt_settings(col, context, brush)
 
             # topology_rake_factor
-            if capabilities.has_topology_rake and \
-               context.sculpt_object.use_dynamic_topology_sculpting:
+            if (capabilities.has_topology_rake and
+                context.sculpt_object.use_dynamic_topology_sculpting
+            ):
                 col.separator()
                 row = col.row()
                 row.prop(brush, "topology_rake_factor", slider=True)
diff --git a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
index a34b7eeb913..1cb9385c848 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_relations.cc
@@ -395,7 +395,8 @@ void DepsgraphRelationBuilder::add_particle_forcefield_relations(
 			add_relation(eff_key, key, name);
 
 			if (ELEM(relation->pd->shape, PFIELD_SHAPE_SURFACE, PFIELD_SHAPE_POINTS) ||
-			    relation->pd->forcefield == PFIELD_GUIDE) {
+			    relation->pd->forcefield == PFIELD_GUIDE)
+			{
 				ComponentKey mod_key(&relation->ob->id, DEG_NODE_TYPE_GEOMETRY);
 				add_relation(mod_key, key, name);
 			}
diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c
index b25b9f4fff6..dc607fe91fd 100644
--- a/source/blender/editors/sculpt_paint/sculpt.c
+++ b/source/blender/editors/sculpt_paint/sculpt.c
@@ -2160,10 +2160,10 @@ static void bmesh_topology_rake(
 		settings.use_threading = ((sd->flags & SCULPT_USE_OPENMP) && totnode > SCULPT_THREADED_LIMIT);
 
 		BLI_task_parallel_range(
-			0, totnode,
-			&data,
-			do_topology_rake_bmesh_task_cb_ex,
-			&settings);
+		        0, totnode,
+		        &data,
+		        do_topology_rake_bmesh_task_cb_ex,
+		        &settings);
 	}
 }
 
@@ -4625,6 +4625,7 @@ static void sculpt_update_brush_delta(UnifiedPaintSettings *ups, Object *ob, Bru
 					mul_mat3_m4_v3(imat, cache->grab_delta);
 					break;
 				default:
+					/* Use for 'Brush.topology_rake_factor'. */
 					sub_v3_v3v3(cache->grab_delta, grab_location, cache->old_grab_location);
 					break;



More information about the Bf-blender-cvs mailing list