[Bf-blender-cvs] [5721863] master: RNA: pass only 0/1 to RNA_property_boolean_set

Campbell Barton noreply at git.blender.org
Thu Feb 19 02:34:00 CET 2015


Commit: 57218638052c72d1e25f3201c8356d11bd690834
Author: Campbell Barton
Date:   Thu Feb 19 12:33:14 2015 +1100
Branches: master
https://developer.blender.org/rB57218638052c72d1e25f3201c8356d11bd690834

RNA: pass only 0/1 to RNA_property_boolean_set

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

M	source/blender/editors/gpencil/gpencil_paint.c
M	source/blender/editors/object/object_bake_api.c
M	source/blender/editors/physics/rigidbody_world.c
M	source/blender/editors/space_clip/clip_ops.c
M	source/blender/editors/space_file/filesel.c
M	source/blender/editors/transform/transform_generics.c

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

diff --git a/source/blender/editors/gpencil/gpencil_paint.c b/source/blender/editors/gpencil/gpencil_paint.c
index 41caa77..38a7ffa 100644
--- a/source/blender/editors/gpencil/gpencil_paint.c
+++ b/source/blender/editors/gpencil/gpencil_paint.c
@@ -1642,7 +1642,7 @@ static void gpencil_draw_apply_event(wmOperator *op, const wmEvent *event)
 	mousef[1] = p->mval[1];
 	RNA_float_set_array(&itemptr, "mouse", mousef);
 	RNA_float_set(&itemptr, "pressure", p->pressure);
-	RNA_boolean_set(&itemptr, "is_start", (p->flags & GP_PAINTFLAG_FIRSTRUN));
+	RNA_boolean_set(&itemptr, "is_start", (p->flags & GP_PAINTFLAG_FIRSTRUN) != 0);
 	
 	RNA_float_set(&itemptr, "time", p->curtime - p->inittime);
 	
diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 1ce5068..97cb45d 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -1214,7 +1214,7 @@ static void bake_set_props(wmOperator *op, Scene *scene)
 
 	prop = RNA_struct_find_property(op->ptr, "use_selected_to_active");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_TO_ACTIVE));
+		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_TO_ACTIVE) != 0);
 	}
 
 	prop = RNA_struct_find_property(op->ptr, "cage_extrusion");
@@ -1254,22 +1254,22 @@ static void bake_set_props(wmOperator *op, Scene *scene)
 
 	prop = RNA_struct_find_property(op->ptr, "use_clear");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_CLEAR));
+		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_CLEAR) != 0);
 	}
 
 	prop = RNA_struct_find_property(op->ptr, "use_cage");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_CAGE));
+		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_CAGE) != 0);
 	}
 
 	prop = RNA_struct_find_property(op->ptr, "use_split_materials");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_SPLIT_MAT));
+		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_SPLIT_MAT) != 0);
 	}
 
 	prop = RNA_struct_find_property(op->ptr, "use_automatic_name");
 	if (!RNA_property_is_set(op->ptr, prop)) {
-		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_AUTO_NAME));
+		RNA_property_boolean_set(op->ptr, prop, (bake->flag & R_BAKE_AUTO_NAME) != 0);
 	}
 }
 
diff --git a/source/blender/editors/physics/rigidbody_world.c b/source/blender/editors/physics/rigidbody_world.c
index 7bb189b..f7a2c83 100644
--- a/source/blender/editors/physics/rigidbody_world.c
+++ b/source/blender/editors/physics/rigidbody_world.c
@@ -167,7 +167,7 @@ static int rigidbody_world_export_exec(bContext *C, wmOperator *op)
 static int rigidbody_world_export_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event))
 {
 	if (!RNA_struct_property_is_set(op->ptr, "relative_path"))
-		RNA_boolean_set(op->ptr, "relative_path", (U.flag & USER_RELPATHS));
+		RNA_boolean_set(op->ptr, "relative_path", (U.flag & USER_RELPATHS) != 0);
 
 	if (RNA_struct_property_is_set(op->ptr, "filepath"))
 		return rigidbody_world_export_exec(C, op);
diff --git a/source/blender/editors/space_clip/clip_ops.c b/source/blender/editors/space_clip/clip_ops.c
index b99b23c..322825c 100644
--- a/source/blender/editors/space_clip/clip_ops.c
+++ b/source/blender/editors/space_clip/clip_ops.c
@@ -274,7 +274,7 @@ static int open_invoke(bContext *C, wmOperator *op, const wmEvent *UNUSED(event)
 		return open_exec(C, op);
 
 	if (!RNA_struct_property_is_set(op->ptr, "relative_path"))
-		RNA_boolean_set(op->ptr, "relative_path", U.flag & USER_RELPATHS);
+		RNA_boolean_set(op->ptr, "relative_path", (U.flag & USER_RELPATHS) != 0);
 
 	open_init(C, op);
 
diff --git a/source/blender/editors/space_file/filesel.c b/source/blender/editors/space_file/filesel.c
index 3206a0f..14b72eb 100644
--- a/source/blender/editors/space_file/filesel.c
+++ b/source/blender/editors/space_file/filesel.c
@@ -231,7 +231,7 @@ short ED_fileselect_set_params(SpaceFile *sfile)
 		if (is_relative_path) {
 			if ((prop = RNA_struct_find_property(op->ptr, "relative_path"))) {
 				if (!RNA_property_is_set_ex(op->ptr, prop, false)) {
-					RNA_property_boolean_set(op->ptr, prop, U.flag & USER_RELPATHS);
+					RNA_property_boolean_set(op->ptr, prop, (U.flag & USER_RELPATHS) != 0);
 				}
 			}
 		}
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c
index 3000b3e..f776476 100644
--- a/source/blender/editors/transform/transform_generics.c
+++ b/source/blender/editors/transform/transform_generics.c
@@ -1220,7 +1220,7 @@ void initTransInfo(bContext *C, TransInfo *t, wmOperator *op, const wmEvent *eve
 				}
 			}
 			else {
-				RNA_property_boolean_set(op->ptr, prop, t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT);
+				RNA_property_boolean_set(op->ptr, prop, (t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT) != 0);
 			}
 		}




More information about the Bf-blender-cvs mailing list