2.5

Think global, act local!

The old favorite G.scene gone! Man... that took almost 2 days.
Also removed G.curscreen and G.edbo.

Not everything could get solved; here's some notes.
- modifiers now store current scene in ModifierData. This is not
  meant for permanent, but it can probably stick there until we
  cleaned the anim system and depsgraph to cope better with
  timing issues.
- Game engine G.scene should become an argument for staring it.
  Didn't solve this yet.
- Texture nodes should get scene cfra, but the current implementation
  is too tightly wrapped to do it easily.

1 files changed, 3 insertions, 1 deletions

diff --git a/source/blender/blenkernel/BKE_constraint.h b/source/blender/blenkernel/BKE_constraint.h
index 2f92fadd5ee..8fe71673a98 100644
--- a/source/blender/blenkernel/BKE_constraint.h
+++ b/source/blender/blenkernel/BKE_constraint.h
@@ -34,6 +34,7 @@ struct bConstraint;
 struct bConstraintTarget;
 struct ListBase;
 struct Object;
+struct Scene;
 struct bConstraintChannel;
 struct bPoseChannel;
 
@@ -41,6 +42,7 @@ struct bPoseChannel;
 
 /* special struct for use in constraint evaluation */
 typedef struct bConstraintOb {
+	struct Scene *scene;		/* for system time, part of deglobalization, code nicer later with local time (ton) */
 	struct Object *ob;			/* if pchan, then armature that it comes from, otherwise constraint owner */
 	struct bPoseChannel *pchan;	/* pose channel that owns the constraints being evaluated */
 	
@@ -128,7 +130,7 @@ void free_constraint_channels(struct ListBase *chanbase);
 
 
 /* Constraint Evaluation function prototypes */
-struct bConstraintOb *constraints_make_evalob(struct Object *ob, void *subdata, short datatype);
+struct bConstraintOb *constraints_make_evalob(struct Scene *scene, struct Object *ob, void *subdata, short datatype);
 void constraints_clear_evalob(struct bConstraintOb *cob);
 
 void constraint_mat_convertspace(struct Object *ob, struct bPoseChannel *pchan, float mat[][4], short from, short to);