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, 0 deletions

diff --git a/source/blender/makesdna/DNA_image_types.h b/source/blender/makesdna/DNA_image_types.h
index e1d79f0f875..7a6e1707dad 100644
--- a/source/blender/makesdna/DNA_image_types.h
+++ b/source/blender/makesdna/DNA_image_types.h
@@ -34,6 +34,7 @@
 #include "DNA_ID.h"
 
 struct PackedFile;
+struct Scene;
 struct anim;
 struct ImBuf;
 struct RenderResult;
@@ -51,6 +52,8 @@ typedef struct ImageUser {
 	
 	short multi_index, layer, pass;	 /* listbase indices, for menu browsing or retrieve buffer */
 	short menunr;					/* localized menu entry, for handling browse event */
+	
+	struct Scene *scene;		/* to retrieve render result */
 } ImageUser;
 
 /* iuser->flag */