Remove some unfinished code I accidentally commit for render thread safety.

1 files changed, 4 insertions, 18 deletions

diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c
index 9cc154a3c2c..27b46c40d28 100644
--- a/source/blender/blenkernel/intern/material.c
+++ b/source/blender/blenkernel/intern/material.c
@@ -204,27 +204,23 @@ Material *add_material(char *name)
 	return ma;	
 }
 
-static Material *copy_material_intern(Material *ma, int for_render)
+Material *copy_material(Material *ma)
 {
 	Material *man;
 	int a;
 	
 	man= copy_libblock(ma);
-	if(for_render)
-		BLI_remlink(&G.main->mat, man);
 	
-	if(!for_render) {
 #if 0 // XXX old animation system
-		id_us_plus((ID *)man->ipo);
+	id_us_plus((ID *)man->ipo);
 #endif // XXX old animation system
-		id_us_plus((ID *)man->group);
-	}
+	id_us_plus((ID *)man->group);
 	
 	for(a=0; a<MAX_MTEX; a++) {
 		if(ma->mtex[a]) {
 			man->mtex[a]= MEM_mallocN(sizeof(MTex), "copymaterial");
 			memcpy(man->mtex[a], ma->mtex[a], sizeof(MTex));
-			if(!for_render) id_us_plus((ID *)man->mtex[a]->tex);
+			id_us_plus((ID *)man->mtex[a]->tex);
 		}
 	}
 	
@@ -242,16 +238,6 @@ static Material *copy_material_intern(Material *ma, int for_render)
 	return man;
 }
 
-Material *copy_material_for_render(Material *ma)
-{
-	return copy_material_intern(ma, 1);
-}
-
-Material *copy_material(Material *ma)
-{
-	return copy_material_intern(ma, 0);
-}
-
 void make_local_material(Material *ma)
 {
 	Object *ob;