Tuesday merger of bf-blender into orange branch.

1 files changed, 11 insertions, 5 deletions

diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c
index 790daa1d818..b11fa7439d8 100644
--- a/source/blender/renderconverter/intern/convertBlenderScene.c
+++ b/source/blender/renderconverter/intern/convertBlenderScene.c
@@ -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;*/
 
 	}