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

diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c
index 64bf5f85d23..c22c2fbe8ad 100644
--- a/source/blender/blenkernel/intern/writeframeserver.c
+++ b/source/blender/blenkernel/intern/writeframeserver.c
@@ -188,7 +188,7 @@ static int safe_puts(char * s)
 	return safe_write(s, strlen(s));
 }
 
-static int handle_request(char * req)
+static int handle_request(RenderData *rd, char * req)
 {
 	char * p;
 	char * path;
@@ -230,11 +230,11 @@ static int handle_request(char * req)
 			"height %d\n" 
 			"rate %d\n"
 			"ratescale %d\n",
-			G.scene->r.sfra,
-			G.scene->r.efra,
+			rd->sfra,
+			rd->efra,
 			render_width,
 			render_height,
-			G.scene->r.frs_sec,
+			rd->frs_sec,
 			1
 			);
 
@@ -249,7 +249,7 @@ static int handle_request(char * req)
 	return -1;
 }
 
-int frameserver_loop(void)
+int frameserver_loop(RenderData *rd)
 {
 	fd_set readfds;
 	struct timeval tv;
@@ -312,7 +312,7 @@ int frameserver_loop(void)
 
 	buf[len] = 0;
 
-	return handle_request(buf);
+	return handle_request(rd, buf);
 }
 
 static void serve_ppm(int *pixels, int rectx, int recty)