[Bf-blender-cvs] [48591511549] master: Cleanup: style

Campbell Barton noreply at git.blender.org
Sun Feb 17 22:50:21 CET 2019


Commit: 485915115490fc04e4eafbaac66f2917fe932020
Author: Campbell Barton
Date:   Mon Feb 18 08:35:03 2019 +1100
Branches: master
https://developer.blender.org/rB485915115490fc04e4eafbaac66f2917fe932020

Cleanup: style

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

M	source/blender/depsgraph/intern/builder/deg_builder_rna.cc
M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/mesh/editmesh_bevel.c
M	source/blender/makesrna/intern/rna_lamp.c

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

diff --git a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
index 6aee365cd8a..90d4627fb34 100644
--- a/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
+++ b/source/blender/depsgraph/intern/builder/deg_builder_rna.cc
@@ -88,7 +88,7 @@ public:
 			        const bPoseChannel *, pchan, &object->pose->chanbase)
 			{
 				LISTBASE_FOREACH (
-				        const bConstraint *, constraint, &pchan->constraints) 
+				        const bConstraint *, constraint, &pchan->constraints)
 				{
 					BLI_ghash_insert(contraint_to_pchan_map_,
 					                 const_cast<bConstraint *>(constraint),
@@ -109,7 +109,7 @@ protected:
 
 /* ***************************** Node Identifier **************************** */
 
-RNANodeIdentifier::RNANodeIdentifier() 
+RNANodeIdentifier::RNANodeIdentifier()
         : id(NULL),
           type(NodeType::UNDEFINED),
           component_name(""),
@@ -143,7 +143,8 @@ RNANodeQuery::RNANodeQuery(Depsgraph *depsgraph)
 {
 }
 
-RNANodeQuery::~RNANodeQuery() {
+RNANodeQuery::~RNANodeQuery()
+{
 	BLI_ghash_free(id_data_map_, NULL, ghash_id_data_free_func);
 }
 
diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index e151a5988e1..731f85d1bea 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -2077,11 +2077,13 @@ static void gp_paint_initstroke(tGPsdata *p, eGPencil_PaintModes paintmode, Deps
 	if (p->gpl == NULL) {
 		p->gpl = BKE_gpencil_layer_addnew(p->gpd, DATA_("GP_Layer"), true);
 
-		if (p->custom_color[3])
+		if (p->custom_color[3]) {
 			copy_v3_v3(p->gpl->color, p->custom_color);
+		}
 	}
 	if ((paintmode != GP_PAINTMODE_ERASER) &&
-		(p->gpl->flag & GP_LAYER_LOCKED)) {
+	    (p->gpl->flag & GP_LAYER_LOCKED))
+	{
 		p->status = GP_STATUS_ERROR;
 		if (G.debug & G_DEBUG)
 			printf("Error: Cannot paint on locked layer\n");
diff --git a/source/blender/editors/mesh/editmesh_bevel.c b/source/blender/editors/mesh/editmesh_bevel.c
index 6bb7d1f253a..ee08b81759a 100644
--- a/source/blender/editors/mesh/editmesh_bevel.c
+++ b/source/blender/editors/mesh/editmesh_bevel.c
@@ -580,7 +580,8 @@ static int edbm_bevel_modal(bContext *C, wmOperator *op, const wmEvent *event)
 
 	/* When activated from toolbar, need to convert leftmouse release to confirm */
 	if (etype == LEFTMOUSE && eval == KM_RELEASE &&
-			RNA_boolean_get(op->ptr, "release_confirm")) {
+	    RNA_boolean_get(op->ptr, "release_confirm"))
+	{
 	    etype = EVT_MODAL_MAP;
 	    eval = BEV_MODAL_CONFIRM;
 	}
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c
index 2e2361aca80..2cec4668e87 100644
--- a/source/blender/makesrna/intern/rna_lamp.c
+++ b/source/blender/makesrna/intern/rna_lamp.c
@@ -186,7 +186,7 @@ static void rna_def_light_energy(StructRNA *srna, bool distant)
 {
 	PropertyRNA *prop;
 
-	if(distant) {
+	if (distant) {
 		/* Distant light strength has no unit defined, it's proportional to
 		 * Watt/m^2 and is not sensitive to scene unit scale. */
 		prop = RNA_def_property(srna, "energy", PROP_FLOAT, PROP_NONE);



More information about the Bf-blender-cvs mailing list