diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-12-15 12:45:20 +0300 |
| commit | f4140f2c8138ec07ba06376c4d0d70d40fca6fad (patch) | |
| tree | b6d7d87fed15896b45b1a1cccfea1175bee0f426 /source/blender/makesrna/intern/rna_ID.c | |
| parent | 2ddee0ba5ac7f6fa66cd21111e49ea43226d8b3b (diff) | |
| parent | c4046e9082f61bfef87173d20c566a065f2602d7 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/makesrna/intern/rna_ID.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_ID.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c index c7446b5674a..cd7e339a2d7 100644 --- a/source/blender/makesrna/intern/rna_ID.c +++ b/source/blender/makesrna/intern/rna_ID.c @@ -783,7 +783,7 @@ static int rna_ID_is_updated_data_get(PointerRNA *ptr) if (data == NULL) { return 0; } - return ((data->tag & LIB_TAG_ID_RECALC_ALL) != 0); + return ((data->recalc & ID_RECALC_ALL) != 0); } static PointerRNA rna_ID_override_reference_get(PointerRNA *ptr) @@ -1037,11 +1037,12 @@ static void rna_def_ID(BlenderRNA *brna) "(initial state is undefined)"); prop = RNA_def_property(srna, "is_updated", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "tag", LIB_TAG_ID_RECALC); + RNA_def_property_boolean_sdna(prop, NULL, "recalc", ID_RECALC); RNA_def_property_clear_flag(prop, PROP_EDITABLE); 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"); |