[Bf-blender-cvs] [632ed6a] master: Cleanup: remove unused scene recalc

Campbell Barton noreply at git.blender.org
Sun Nov 1 02:58:36 CET 2015


Commit: 632ed6a0d6795831ef94a4b5053fb883a57e7198
Author: Campbell Barton
Date:   Sun Nov 1 12:45:15 2015 +1100
Branches: master
https://developer.blender.org/rB632ed6a0d6795831ef94a4b5053fb883a57e7198

Cleanup: remove unused scene recalc

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

M	source/blender/blenkernel/intern/depsgraph.c
M	source/blender/editors/transform/transform_conversions.c
M	source/blender/makesdna/DNA_scene_types.h

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

diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c
index e49726b..17faae0 100644
--- a/source/blender/blenkernel/intern/depsgraph.c
+++ b/source/blender/blenkernel/intern/depsgraph.c
@@ -1655,9 +1655,6 @@ static void dag_scene_build(Main *bmain, Scene *sce)
 		}
 	}
 
-	/* temporal...? */
-	sce->recalc |= SCE_PRV_CHANGED; /* test for 3d preview */
-
 	/* Make sure that new dependencies which came from invisible layers
 	 * are tagged for update (if they're needed for objects which were
 	 * tagged for update).
diff --git a/source/blender/editors/transform/transform_conversions.c b/source/blender/editors/transform/transform_conversions.c
index 52e0ede..484b069 100644
--- a/source/blender/editors/transform/transform_conversions.c
+++ b/source/blender/editors/transform/transform_conversions.c
@@ -8085,8 +8085,4 @@ void createTransData(bContext *C, TransInfo *t)
 			}
 		}
 	}
-
-// TRANSFORM_FIX_ME
-//	/* temporal...? */
-//	t->scene->recalc |= SCE_PRV_CHANGED;	/* test for 3d preview */
 }
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 26b1d7b..02a68aa 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -1414,7 +1414,7 @@ typedef struct Scene {
 	void *pad1;
 	struct  DagForest *theDag;
 	short dagflags;
-	short recalc;				/* recalc = counterpart of ob->recalc */
+	short pad3;
 
 	/* User-Defined KeyingSets */
 	int active_keyingset;			/* index of the active KeyingSet. first KeyingSet has index 1, 'none' active is 0, 'add new' is -1 */
@@ -1738,9 +1738,6 @@ extern const char *RE_engine_id_CYCLES;
 #define SCE_SELECT_POINT	2
 #define SCE_SELECT_END		4
 
-/* sce->recalc (now in use by previewrender) */
-#define SCE_PRV_CHANGED		1
-
 /* toolsettings->prop_mode (proportional falloff) */
 #define PROP_SMOOTH            0
 #define PROP_SPHERE            1




More information about the Bf-blender-cvs mailing list