[Bf-blender-cvs] [45fdf41be87] blender2.8: RNA: use is_dirty prefix for checking updates

Campbell Barton noreply at git.blender.org
Thu Jul 5 21:49:55 CEST 2018


Commit: 45fdf41be87fb0b2fbf85778a714537ed1f5eca3
Author: Campbell Barton
Date:   Thu Jul 5 21:48:46 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB45fdf41be87fb0b2fbf85778a714537ed1f5eca3

RNA: use is_dirty prefix for checking updates

Common convention for read-only update checks

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

M	source/blender/makesrna/intern/rna_depsgraph.c

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

diff --git a/source/blender/makesrna/intern/rna_depsgraph.c b/source/blender/makesrna/intern/rna_depsgraph.c
index eb069b5e069..f1ff038ddd7 100644
--- a/source/blender/makesrna/intern/rna_depsgraph.c
+++ b/source/blender/makesrna/intern/rna_depsgraph.c
@@ -143,27 +143,27 @@ static PointerRNA rna_DepsgraphUpdate_id_get(PointerRNA *ptr)
 	return rna_pointer_inherit_refine(ptr, &RNA_ID, ptr->data);
 }
 
-static int rna_DepsgraphUpdate_updated_transform_get(PointerRNA *ptr)
+static int rna_DepsgraphUpdate_is_dirty_transform_get(PointerRNA *ptr)
 {
 	ID *id = ptr->data;
-	return ((id->recalc & ID_RECALC_TRANSFORM) != 0);
+	return ((id->recalc & ID_RECALC_TRANSFORM) == 0);
 }
 
-static int rna_DepsgraphUpdate_updated_geometry_get(PointerRNA *ptr)
+static int rna_DepsgraphUpdate_is_dirty_geometry_get(PointerRNA *ptr)
 {
 	ID *id = ptr->data;
 	if (id->recalc & ID_RECALC_GEOMETRY) {
-		return true;
+		return false;
 	}
 	if (GS(id->name) != ID_OB) {
-		return false;
+		return true;
 	}
 	Object *object = (Object *)id;
 	ID *data = object->data;
 	if (data == NULL) {
-		return 0;
+		return true;
 	}
-	return ((data->recalc & ID_RECALC_ALL) != 0);
+	return ((data->recalc & ID_RECALC_ALL) == 0);
 }
 
 /* **************** Depsgraph **************** */
@@ -454,15 +454,15 @@ static void rna_def_depsgraph_update(BlenderRNA *brna)
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
 	RNA_def_property_pointer_funcs(prop, "rna_DepsgraphUpdate_id_get", NULL, NULL, NULL);
 
-	prop = RNA_def_property(srna, "updated_transform", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "is_dirty_transform", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Transform", "Object transformation was updated");
-	RNA_def_property_boolean_funcs(prop, "rna_DepsgraphUpdate_updated_transform_get", NULL);
+	RNA_def_property_ui_text(prop, "Transform", "Object transformation is not updated");
+	RNA_def_property_boolean_funcs(prop, "rna_DepsgraphUpdate_is_dirty_transform_get", NULL);
 
-	prop = RNA_def_property(srna, "updated_geometry", PROP_BOOLEAN, PROP_NONE);
+	prop = RNA_def_property(srna, "is_dirty_geometry", PROP_BOOLEAN, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
-	RNA_def_property_ui_text(prop, "Geometry", "Object geometry was updated");
-	RNA_def_property_boolean_funcs(prop, "rna_DepsgraphUpdate_updated_geometry_get", NULL);
+	RNA_def_property_ui_text(prop, "Geometry", "Object geometry is not updated");
+	RNA_def_property_boolean_funcs(prop, "rna_DepsgraphUpdate_is_dirty_geometry_get", NULL);
 }
 
 static void rna_def_depsgraph(BlenderRNA *brna)



More information about the Bf-blender-cvs mailing list