1 files changed, 14 insertions, 17 deletions

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 11c96e9a347..9774e97f69b 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -56,10 +56,6 @@
 #include "BKE_node.h"
 #include "BKE_utildefines.h"
 
-#ifndef DISABLE_PYTHON
-#include "BPY_extern.h"
-#endif
-
 #include "GPU_material.h"
 
 /* used in UI and render */
@@ -236,6 +232,7 @@ Material *copy_material(Material *ma)
 
 void make_local_material(Material *ma)
 {
+	Main *bmain= G.main;
 	Object *ob;
 	Mesh *me;
 	Curve *cu;
@@ -261,7 +258,7 @@ void make_local_material(Material *ma)
 	}
 	
 	/* test objects */
-	ob= G.main->object.first;
+	ob= bmain->object.first;
 	while(ob) {
 		if(ob->mat) {
 			for(a=0; a<ob->totcol; a++) {
@@ -274,7 +271,7 @@ void make_local_material(Material *ma)
 		ob= ob->id.next;
 	}
 	/* test meshes */
-	me= G.main->mesh.first;
+	me= bmain->mesh.first;
 	while(me) {
 		if(me->mat) {
 			for(a=0; a<me->totcol; a++) {
@@ -287,7 +284,7 @@ void make_local_material(Material *ma)
 		me= me->id.next;
 	}
 	/* test curves */
-	cu= G.main->curve.first;
+	cu= bmain->curve.first;
 	while(cu) {
 		if(cu->mat) {
 			for(a=0; a<cu->totcol; a++) {
@@ -300,7 +297,7 @@ void make_local_material(Material *ma)
 		cu= cu->id.next;
 	}
 	/* test mballs */
-	mb= G.main->mball.first;
+	mb= bmain->mball.first;
 	while(mb) {
 		if(mb->mat) {
 			for(a=0; a<mb->totcol; a++) {
@@ -329,7 +326,7 @@ void make_local_material(Material *ma)
 		man->id.us= 0;
 		
 		/* do objects */
-		ob= G.main->object.first;
+		ob= bmain->object.first;
 		while(ob) {
 			if(ob->mat) {
 				for(a=0; a<ob->totcol; a++) {
@@ -345,7 +342,7 @@ void make_local_material(Material *ma)
 			ob= ob->id.next;
 		}
 		/* do meshes */
-		me= G.main->mesh.first;
+		me= bmain->mesh.first;
 		while(me) {
 			if(me->mat) {
 				for(a=0; a<me->totcol; a++) {
@@ -361,7 +358,7 @@ void make_local_material(Material *ma)
 			me= me->id.next;
 		}
 		/* do curves */
-		cu= G.main->curve.first;
+		cu= bmain->curve.first;
 		while(cu) {
 			if(cu->mat) {
 				for(a=0; a<cu->totcol; a++) {
@@ -377,7 +374,7 @@ void make_local_material(Material *ma)
 			cu= cu->id.next;
 		}
 		/* do mballs */
-		mb= G.main->mball.first;
+		mb= bmain->mball.first;
 		while(mb) {
 			if(mb->mat) {
 				for(a=0; a<mb->totcol; a++) {
@@ -783,14 +780,14 @@ void init_render_material(Material *mat, int r_mode, float *amb)
 	}
 }
 
-void init_render_materials(int r_mode, float *amb)
+void init_render_materials(Main *bmain, int r_mode, float *amb)
 {
 	Material *ma;
 	
 	/* clear these flags before going over materials, to make sure they
 	 * are cleared only once, otherwise node materials contained in other
 	 * node materials can go wrong */
-	for(ma= G.main->mat.first; ma; ma= ma->id.next) {
+	for(ma= bmain->mat.first; ma; ma= ma->id.next) {
 		if(ma->id.us) {
 			ma->texco= 0;
 			ma->mapto= 0;
@@ -798,7 +795,7 @@ void init_render_materials(int r_mode, float *amb)
 	}
 
 	/* two steps, first initialize, then or the flags for layers */
-	for(ma= G.main->mat.first; ma; ma= ma->id.next) {
+	for(ma= bmain->mat.first; ma; ma= ma->id.next) {
 		/* is_used flag comes back in convertblender.c */
 		ma->flag &= ~MA_IS_USED;
 		if(ma->id.us) 
@@ -815,10 +812,10 @@ void end_render_material(Material *mat)
 		ntreeEndExecTree(mat->nodetree); /* has internal flag to detect it only does it once */
 }
 
-void end_render_materials(void)
+void end_render_materials(Main *bmain)
 {
 	Material *ma;
-	for(ma= G.main->mat.first; ma; ma= ma->id.next)
+	for(ma= bmain->mat.first; ma; ma= ma->id.next)
 		if(ma->id.us) 
 			end_render_material(ma);
 }