Sorted BaseLegacy > Base convertions

Including bring back UV Edit show other objects

1 files changed, 7 insertions, 9 deletions

diff --git a/source/blender/render/intern/source/envmap.c b/source/blender/render/intern/source/envmap.c
index 7de20ab2056..33258d04673 100644
--- a/source/blender/render/intern/source/envmap.c
+++ b/source/blender/render/intern/source/envmap.c
@@ -51,6 +51,7 @@
 
 #include "BKE_main.h"
 #include "BKE_image.h"   /* BKE_imbuf_write */
+#include "BKE_layer.h"
 #include "BKE_texture.h"
 #include "BKE_scene.h"
 
@@ -247,17 +248,14 @@ static void envmap_transmatrix(float mat[4][4], int part)
 
 static void env_set_imats(Render *re)
 {
-	BaseLegacy *base;
 	float mat[4][4];
-	
-	base = re->scene->base.first;
-	while (base) {
-		mul_m4_m4m4(mat, re->viewmat, base->object->obmat);
-		invert_m4_m4(base->object->imat, mat);
-		
-		base = base->next;
+
+	FOREACH_SCENE_OBJECT(re->scene, ob)
+	{
+		mul_m4_m4m4(mat, re->viewmat, ob->obmat);
+		invert_m4_m4(ob->imat, mat);
 	}
-	
+	FOREACH_SCENE_OBJECT_END
 }
 
 /* ------------------------------------------------------------------------- */