[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [29687] trunk/blender/source/blender/ editors: bugfix where animated image texture' s lagged one frame when used with modifiers.

[Campbell Barton]

Revision: 29687
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=29687
Author:   campbellbarton
Date:     2010-06-25 14:28:35 +0200 (Fri, 25 Jun 2010)

Log Message:
-----------
bugfix where animated image texture's lagged one frame when used with modifiers.
call animated texture update before evaluating modifiers.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_opengl.c
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/editors/render/render_opengl.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_opengl.c	2010-06-25 12:17:35 UTC (rev 29686)
+++ trunk/blender/source/blender/editors/render/render_opengl.c	2010-06-25 12:28:35 UTC (rev 29687)
@@ -305,6 +305,10 @@
 	int ok= 0;
 	int view_context = (oglrender->v3d != NULL);
 
+	/* update animated image textures for gpu, etc,
+	 * call before scene_update_for_newframe so modifiers with textuers dont lag 1 frame */
+	ED_image_update_frame(C);
+
 	/* go to next frame */
 	while(CFRA<oglrender->nfra) {
 		unsigned int lay= screen_opengl_layers(oglrender);
@@ -330,9 +334,6 @@
 		scene_camera_switch_update(scene);
 	}
 
-	/* update animated image textures for gpu, etc */
-	ED_image_update_frame(C);
-
 	/* render into offscreen buffer */
 	screen_opengl_render_apply(oglrender);
 

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2010-06-25 12:17:35 UTC (rev 29686)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2010-06-25 12:28:35 UTC (rev 29687)
@@ -1737,6 +1737,10 @@
 
 	//extern void audiostream_scrub(unsigned int frame);	/* seqaudio.c */
 	
+	/* update animated image textures for gpu, etc,
+	 * call before scene_update_for_newframe so modifiers with textuers dont lag 1 frame */
+	ED_image_update_frame(C);
+
 	/* this function applies the changes too */
 	/* XXX future: do all windows */
 	scene_update_for_newframe(scene, BKE_screen_visible_layers(screen, scene)); /* BKE_scene.h */
@@ -1754,9 +1758,6 @@
 	if(scene->use_nodes && scene->nodetree)
 		ntreeCompositTagAnimated(scene->nodetree);
 	
-	/* update animated image textures for gpu, etc */
-	ED_image_update_frame(C);
-	
 	/* update animated texture nodes */
 	{
 		Tex *tex;