[Bf-blender-cvs] [141c0f8] master: Cleanup: rna naming, indentation

[Campbell Barton]

Commit: 141c0f8ad1f23870e29b58566d71bd912625e93e
Author: Campbell Barton
Date:   Sat May 14 01:28:21 2016 +1000
Branches: master
https://developer.blender.org/rB141c0f8ad1f23870e29b58566d71bd912625e93e

Cleanup: rna naming, indentation

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

M	source/blender/blenkernel/intern/dynamicpaint.c
M	source/blender/windowmanager/intern/wm_files_link.c

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

diff --git a/source/blender/blenkernel/intern/dynamicpaint.c b/source/blender/blenkernel/intern/dynamicpaint.c
index 1bed137..18672b9 100644
--- a/source/blender/blenkernel/intern/dynamicpaint.c
+++ b/source/blender/blenkernel/intern/dynamicpaint.c
@@ -2305,10 +2305,10 @@ int dynamicPaint_createUVSurface(Scene *scene, DynamicPaintSurface *surface)
 						/* Check uv bb	*/
 						if ((faceBB[i].min[0] > (point[sample][0])) ||
 						    (faceBB[i].min[1] > (point[sample][1])) ||
-							(faceBB[i].max[0] < (point[sample][0])) ||
-							(faceBB[i].max[1] < (point[sample][1])))
+						    (faceBB[i].max[0] < (point[sample][0])) ||
+						    (faceBB[i].max[1] < (point[sample][1])))
 						{
-						    continue;
+							continue;
 						}
 
 						const float *uv1 = mloopuv[mlooptri[i].tri[0]].uv;
@@ -3584,7 +3584,8 @@ static int dynamicPaint_paintParticles(DynamicPaintSurface *surface,
 		/* Proceed only if particle is active	*/
 		if ((pa->alive == PARS_UNBORN && (part->flag & PART_UNBORN) == 0) ||
 		    (pa->alive == PARS_DEAD && (part->flag & PART_DIED) == 0) ||
-		    (pa->flag & PARS_UNEXIST)) {
+		    (pa->flag & PARS_UNEXIST))
+		{
 			continue;
 		}
 
@@ -3858,7 +3859,8 @@ static int dynamicPaint_paintSinglePoint(
 
 			/* color ramp */
 			if (brush->proximity_falloff == MOD_DPAINT_PRFALL_RAMP &&
-			    do_colorband(brush->paint_ramp, (1.0f - strength), colorband)) {
+			    do_colorband(brush->paint_ramp, (1.0f - strength), colorband))
+			{
 				strength = colorband[3];
 			}
 
diff --git a/source/blender/windowmanager/intern/wm_files_link.c b/source/blender/windowmanager/intern/wm_files_link.c
index b5a8ff0..2e4a4b6 100644
--- a/source/blender/windowmanager/intern/wm_files_link.c
+++ b/source/blender/windowmanager/intern/wm_files_link.c
@@ -412,9 +412,9 @@ static int wm_link_append_exec(bContext *C, wmOperator *op)
 	/* append, rather than linking */
 	if ((flag & FILE_LINK) == 0) {
 		const bool set_fake = RNA_boolean_get(op->ptr, "set_fake");
-		const bool do_recursive = RNA_boolean_get(op->ptr, "do_recursive");
+		const bool use_recursive = RNA_boolean_get(op->ptr, "use_recursive");
 
-		if (do_recursive) {
+		if (use_recursive) {
 			BKE_library_make_local(bmain, NULL, true, set_fake);
 		}
 		else {
@@ -515,6 +515,6 @@ void WM_OT_append(wmOperatorType *ot)
 	wm_link_append_properties_common(ot, false);
 	RNA_def_boolean(ot->srna, "set_fake", false, "Fake User",
 	                "Set Fake User for appended items (except Objects and Groups)");
-	RNA_def_boolean(ot->srna, "do_recursive", true, "Localize All",
+	RNA_def_boolean(ot->srna, "use_recursive", true, "Localize All",
 	                "Localize all appended data, including those indirectly linked from other libraries");
 }