griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix bad merge happened at some point

Browse Source
This commit is contained in:
Sergey Sharybin
2017-12-18 16:04:06 +01:00
parent 5566a88873
commit 1fb43dcd5a
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/makesdna/DNA_ID.h
View 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) */

1
source/blender/makesrna/intern/rna_ID.c
View 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");