RNA: revert recent rename 'updated' -> 'dirty'
authorCampbell Barton <ideasman42@gmail.com>
Thu, 13 Dec 2018 12:15:15 +0000 (23:15 +1100)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 13 Dec 2018 12:19:01 +0000 (23:19 +1100)
Partially reverts 45fdf41be87f & 6d38d824377c,
added comment why term 'updated' is used in this case.

intern/cycles/blender/blender_sync.cpp
source/blender/makesrna/intern/rna_depsgraph.c

index fd45bac645d9bb18fc9f6dc17d9473b57ea46f2e..7ac44a3ec9e7c22747f82d9a04ad8becf56f4981 100644 (file)
@@ -123,9 +123,9 @@ void BlenderSync::sync_recalc(BL::Depsgraph& b_depsgraph)
                /* Object */
                else if(b_id.is_a(&RNA_Object)) {
                        BL::Object b_ob(b_id);
-                       const bool updated_geometry = !b_update->is_dirty_geometry();
+                       const bool updated_geometry = b_update->is_updated_geometry();
 
-                       if(!b_update->is_dirty_transform()) {
+                       if(b_update->is_updated_transform()) {
                                object_map.set_recalc(b_ob);
                                light_map.set_recalc(b_ob);
                        }
index 4c455915361a3f689d5147f120803b0796a2e573..1103e5c1f927abdea4b45c1251047106e4f9d8a4 100644 (file)
@@ -177,27 +177,27 @@ static PointerRNA rna_DepsgraphUpdate_id_get(PointerRNA *ptr)
        return rna_pointer_inherit_refine(ptr, &RNA_ID, ptr->data);
 }
 
-static bool rna_DepsgraphUpdate_is_dirty_transform_get(PointerRNA *ptr)
+static bool rna_DepsgraphUpdate_is_updated_transform_get(PointerRNA *ptr)
 {
        ID *id = ptr->data;
-       return ((id->recalc & ID_RECALC_TRANSFORM) == 0);
+       return ((id->recalc & ID_RECALC_TRANSFORM) != 0);
 }
 
-static bool rna_DepsgraphUpdate_is_dirty_geometry_get(PointerRNA *ptr)
+static bool rna_DepsgraphUpdate_is_updated_geometry_get(PointerRNA *ptr)
 {
        ID *id = ptr->data;
        if (id->recalc & ID_RECALC_GEOMETRY) {
-               return false;
+               return true;
        }
        if (GS(id->name) != ID_OB) {
-               return true;
+               return false;
        }
        Object *object = (Object *)id;
        ID *data = object->data;
        if (data == NULL) {
-               return true;
+               return false;
        }
-       return ((data->recalc & ID_RECALC_ALL) == 0);
+       return ((data->recalc & ID_RECALC_ALL) != 0);
 }
 
 /* **************** Depsgraph **************** */
@@ -513,15 +513,18 @@ 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, "is_dirty_transform", PROP_BOOLEAN, PROP_NONE);
+       /* Use term 'is_updated' instead of 'is_dirty' here because this is a signal
+        * that users of the depsgraph may want to update their data (render engines for eg). */
+
+       prop = RNA_def_property(srna, "is_updated_transform", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
-       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);
+       RNA_def_property_ui_text(prop, "Transform", "Object transformation is updated");
+       RNA_def_property_boolean_funcs(prop, "rna_DepsgraphUpdate_is_updated_transform_get", NULL);
 
-       prop = RNA_def_property(srna, "is_dirty_geometry", PROP_BOOLEAN, PROP_NONE);
+       prop = RNA_def_property(srna, "is_updated_geometry", PROP_BOOLEAN, PROP_NONE);
        RNA_def_property_clear_flag(prop, PROP_ANIMATABLE | PROP_EDITABLE);
-       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);
+       RNA_def_property_ui_text(prop, "Geometry", "Object geometry is updated");
+       RNA_def_property_boolean_funcs(prop, "rna_DepsgraphUpdate_is_updated_geometry_get", NULL);
 }
 
 static void rna_def_depsgraph(BlenderRNA *brna)