Fix bad merge happened at some point
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Dec 2017 15:04:06 +0000 (16:04 +0100)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 18 Dec 2017 15:04:06 +0000 (16:04 +0100)
source/blender/makesdna/DNA_ID.h
source/blender/makesrna/intern/rna_ID.c

index a2f646277870adf831437753e64e1b4d834737fe..0b8778674b343c6048bc527a7a6f57a04c3eb3d2 100644 (file)
@@ -459,9 +459,7 @@ enum {
 enum {
        /* RESET_AFTER_USE, used by update code (depsgraph). */
        ID_RECALC       = 1 << 0,
-       ID_RECALC_DATA  = 1 << 1,
-       ID_RECALC_SKIP_ANIM_TAG  = 1 << 2,
-       ID_RECALC_ALL   = (ID_RECALC | ID_RECALC_DATA),
+       ID_RECALC_ALL   = ID_RECALC,
 };
 
 /* To filter ID types (filter_id) */
index cd7e339a2d7cb36c0a5e3af62c337af2dc93c897..f2b6cc954b53a38aabdd6d08c312dbc47755afb8 100644 (file)
@@ -1042,7 +1042,6 @@ static void rna_def_ID(BlenderRNA *brna)
        RNA_def_property_ui_text(prop, "Is Updated", "Data-block is tagged for recalculation");
 
        prop = RNA_def_property(srna, "is_updated_data", PROP_BOOLEAN, PROP_NONE);
-       RNA_def_property_boolean_sdna(prop, NULL, "recalc", ID_RECALC_DATA);
        RNA_def_property_clear_flag(prop, PROP_EDITABLE);
        RNA_def_property_boolean_funcs(prop, "rna_ID_is_updated_data_get", NULL);
        RNA_def_property_ui_text(prop, "Is Updated Data", "Data-block data is tagged for recalculation");