Merged changes in the trunk up to revision 31403.
[blender.git] / source / blender / render / intern / source / pipeline.c
index a537a2376ae0ba1fd0998e7957e4cb1146f422ee..357e81ac3036a36c0e64e389d15060c299e2d91d 100644 (file)
@@ -39,6 +39,8 @@
 #include "DNA_sequence_types.h"
 #include "DNA_userdef_types.h"
 
+#include "MEM_guardedalloc.h"
+
 #include "BKE_utildefines.h"
 #include "BKE_global.h"
 #include "BKE_image.h"
@@ -53,8 +55,6 @@
 #include "BKE_pointcache.h"
 #include "BKE_animsys.h"       /* <------ should this be here?, needed for sequencer update */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
 #include "BLI_rand.h"
@@ -1774,9 +1774,9 @@ static void do_render_3d(Render *re)
        
        /* make render verts/faces/halos/lamps */
        if(render_scene_needs_vector(re))
-               RE_Database_FromScene_Vectors(re, re->scene, re->lay);
+               RE_Database_FromScene_Vectors(re, re->main, re->scene, re->lay);
        else
-          RE_Database_FromScene(re, re->scene, re->lay, 1);
+          RE_Database_FromScene(re, re->main, re->scene, re->lay, 1);
        
        threaded_tile_processor(re);
        
@@ -2153,6 +2153,7 @@ static void render_scene(Render *re, Scene *sce, int cfra)
        RE_InitState(resc, re, &sce->r, NULL, winx, winy, &re->disprect);
        
        /* still unsure entity this... */
+       resc->main= re->main;
        resc->scene= sce;
        resc->lay= sce->lay;
        
@@ -2538,7 +2539,7 @@ static void do_render_seq(Render * re)
 
        recurs_depth++;
 
-       ibuf= give_ibuf_seq(re->scene, rr->rectx, rr->recty, cfra, 0, 100.0);
+       ibuf= give_ibuf_seq(re->main, re->scene, rr->rectx, rr->recty, cfra, 0, 100.0);
 
        recurs_depth--;