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, 6 insertions, 3 deletions

diff --git a/source/blender/blenkernel/BKE_lattice.h b/source/blender/blenkernel/BKE_lattice.h
index dc7c9dcd5e5..181c0cec45a 100644
--- a/source/blender/blenkernel/BKE_lattice.h
+++ b/source/blender/blenkernel/BKE_lattice.h
@@ -33,6 +33,7 @@
 
 struct Lattice;
 struct Object;
+struct Scene;
 struct DerivedMesh;
 struct BPoint;
 struct MDeformVert;
@@ -51,10 +52,11 @@ void calc_latt_deform(float *co, float weight);
 void end_latt_deform(void);
 int object_deform_mball(struct Object *ob);
 void outside_lattice(struct Lattice *lt);
-void curve_deform_verts(struct Object *cuOb, struct Object *target, 
+
+void curve_deform_verts(struct Scene *scene, struct Object *cuOb, struct Object *target, 
 						struct DerivedMesh *dm, float (*vertexCos)[3], 
 						int numVerts, char *vgroup, short defaxis);
-void curve_deform_vector(struct Object *cuOb, struct Object *target, 
+void curve_deform_vector(struct Scene *scene, struct Object *cuOb, struct Object *target, 
 						 float *orco, float *vec, float mat[][3], int no_rot_axis);
 
 void lattice_deform_verts(struct Object *laOb, struct Object *target,
@@ -64,9 +66,10 @@ void armature_deform_verts(struct Object *armOb, struct Object *target,
                            struct DerivedMesh *dm, float (*vertexCos)[3],
                            float (*defMats)[3][3], int numVerts, int deformflag, 
 						   float (*prevCos)[3], const char *defgrp_name);
+
 float (*lattice_getVertexCos(struct Object *ob, int *numVerts_r))[3];
 void lattice_applyVertexCos(struct Object *ob, float (*vertexCos)[3]);
-void lattice_calc_modifiers(struct Object *ob);
+void lattice_calc_modifiers(struct Scene *scene, struct Object *ob);
 
 struct MDeformVert* lattice_get_deform_verts(struct Object *lattice);