Tuesday merger of bf-blender into orange branch.
[blender-staging.git] / source / blender / renderconverter / intern / convertBlenderScene.c
index 790daa1d8183e668aae2288b5bae21c2ad464f88..b11fa7439d874e387f2966363a94820067201b2e 100644 (file)
@@ -2840,8 +2840,8 @@ extern ListBase duplilist;
 void RE_rotateBlenderScene(void)
 {
        Base *base;
-       Object *ob;
-       Scene *sce;
+       Object *ob, *obd;
+       Scene *sce, *setscene;
        unsigned int lay;
        float mat[4][4];
 
@@ -2908,7 +2908,7 @@ void RE_rotateBlenderScene(void)
        }
        
        sce= G.scene;
-
+       setscene= G.scene->set;
        base= G.scene->base.first;
        while(base) {
 
@@ -3014,11 +3014,17 @@ void RE_rotateBlenderScene(void)
                }
                if(blender_test_break()) break;
 
-               if(base->next==0 && G.scene->set && base==G.scene->base.last) {
+               base= base->next;
+               if(base==0 && setscene) {
+                       sce= setscene;
+                       base= setscene->base.first;
+                       setscene= setscene->set;
+               }
+               /*if(base->next==0 && G.scene->set && base==G.scene->base.last) {
                        base= G.scene->set->base.first;
                        sce= G.scene->set;
                }
-               else base= base->next;
+               else base= base->next;*/
 
        }