[Bf-blender-cvs] [1fb43dcd5a7] blender2.8: Fix bad merge happened at some point
Sergey Sharybin
noreply at git.blender.org
Mon Dec 18 16:04:22 CET 2017
Commit: 1fb43dcd5a7549f98a96faa41110ca22877003e5
Author: Sergey Sharybin
Date: Mon Dec 18 16:04:06 2017 +0100
Branches: blender2.8
https://developer.blender.org/rB1fb43dcd5a7549f98a96faa41110ca22877003e5
Fix bad merge happened at some point
===================================================================
M source/blender/makesdna/DNA_ID.h
M source/blender/makesrna/intern/rna_ID.c
===================================================================
diff --git a/source/blender/makesdna/DNA_ID.h b/source/blender/makesdna/DNA_ID.h
index a2f64627787..0b8778674b3 100644
--- a/source/blender/makesdna/DNA_ID.h
+++ b/source/blender/makesdna/DNA_ID.h
@@ -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) */
diff --git a/source/blender/makesrna/intern/rna_ID.c b/source/blender/makesrna/intern/rna_ID.c
index cd7e339a2d7..f2b6cc954b5 100644
--- a/source/blender/makesrna/intern/rna_ID.c
+++ b/source/blender/makesrna/intern/rna_ID.c
@@ -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");
More information about the Bf-blender-cvs
mailing list