[Bf-blender-cvs] [bf9460e3cf7] blender2.8: Cleanup: Get rid of legacy extra recalc flags

[Sergey Sharybin]

Commit: bf9460e3cf7a26fd939ec0e80f86bb3cebf7a71e
Author: Sergey Sharybin
Date:   Tue Jan 16 16:45:35 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBbf9460e3cf7a26fd939ec0e80f86bb3cebf7a71e

Cleanup: Get rid of legacy extra recalc flags

Those are not used by new dependency graph and are not needed for properly
created rigs with new granular nodes.

===================================================================

M	release/scripts/startup/bl_ui/properties_object.py
M	source/blender/makesdna/DNA_object_types.h
M	source/blender/makesrna/intern/rna_object.c

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index 2742ef9f297..c6899eec408 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -173,9 +173,6 @@ class OBJECT_PT_relations_extras(ObjectButtonsPanel, Panel):
         row.active = ((ob.parent is not None) and (ob.use_slow_parent))
         row.prop(ob, "slow_parent_offset", text="Offset")
 
-        layout.prop(ob, "use_extra_recalc_object")
-        layout.prop(ob, "use_extra_recalc_data")
-
 
 class GROUP_MT_specials(Menu):
     bl_label = "Group Specials"
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index dae0a057450..3219d0af7e4 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -204,7 +204,7 @@ typedef struct Object {
 	short nlaflag;				/* used for DopeSheet filtering settings (expanded/collapsed) */
 	short scaflag;				/* ui state for game logic */
 	char scavisflag;			/* more display settings for game logic */
-	char depsflag;
+	char pad;
 
 	/* did last modifier stack generation need mapping support? */
 	char lastNeedMapping;  /* bool */
@@ -629,12 +629,6 @@ enum {
 	OB_BODY_TYPE_CHARACTER      = 8,
 };
 
-/* ob->depsflag */
-enum {
-	OB_DEPS_EXTRA_OB_RECALC     = 1 << 0,
-	OB_DEPS_EXTRA_DATA_RECALC   = 1 << 1,
-};
-
 /* ob->deg_update_flag */
 enum {
 	DEG_RUNTIME_DATA_UPDATE     = 1 << 0,
diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index b83b793b431..f2b2e95d21e 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -2852,16 +2852,7 @@ static void rna_def_object(BlenderRNA *brna)
 	RNA_def_property_range(prop, MINAFRAMEF, MAXFRAMEF);
 	RNA_def_property_ui_text(prop, "Slow Parent Offset", "Delay in the parent relationship");
 	RNA_def_property_update(prop, NC_OBJECT | ND_TRANSFORM, "rna_Object_internal_update");
-	
-	/* depsgraph hack */
-	prop = RNA_def_property(srna, "use_extra_recalc_object", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "depsflag", OB_DEPS_EXTRA_OB_RECALC);
-	RNA_def_property_ui_text(prop, "Extra Object Update", "Refresh this object again on frame changes, dependency graph hack");
-	
-	prop = RNA_def_property(srna, "use_extra_recalc_data", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "depsflag", OB_DEPS_EXTRA_DATA_RECALC);
-	RNA_def_property_ui_text(prop, "Extra Data Update", "Refresh this object's data again on frame changes, dependency graph hack");
-	
+
 	/* duplicates */
 	prop = RNA_def_property(srna, "dupli_type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_bitflag_sdna(prop, NULL, "transflag");