[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26986] trunk/blender/source/blender: Remove some unfinished code I accidentally commit for render thread safety .

[Brecht Van Lommel]

Revision: 26986
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26986
Author:   blendix
Date:     2010-02-17 12:35:20 +0100 (Wed, 17 Feb 2010)

Log Message:
-----------
Remove some unfinished code I accidentally commit for render thread safety.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_material.h
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/editors/render/render_preview.c

Modified: trunk/blender/source/blender/blenkernel/BKE_material.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_material.h	2010-02-17 10:23:14 UTC (rev 26985)
+++ trunk/blender/source/blender/blenkernel/BKE_material.h	2010-02-17 11:35:20 UTC (rev 26986)
@@ -77,8 +77,6 @@
 
 void ramp_blend(int type, float *r, float *g, float *b, float fac, float *col);
 
-struct Material *copy_material_for_render(struct Material *ma);
-
 /* copy/paste */
 void clear_matcopybuf(void);
 void free_matcopybuf(void);

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c	2010-02-17 10:23:14 UTC (rev 26985)
+++ trunk/blender/source/blender/blenkernel/intern/material.c	2010-02-17 11:35:20 UTC (rev 26986)
@@ -204,27 +204,23 @@
 	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 @@
 	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;

Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c	2010-02-17 10:23:14 UTC (rev 26985)
+++ trunk/blender/source/blender/editors/render/render_preview.c	2010-02-17 11:35:20 UTC (rev 26986)
@@ -884,16 +884,9 @@
 	char name[32];
 	int sizex;
 
-	if(GS(id->name) == ID_MA)
-		id= (ID*)copy_material_for_render((Material*)id);
-
 	/* get the stuff from the builtin preview dbase */
 	sce= preview_prepare_scene(sp->scene, id, idtype, sp); // XXX sizex
-	if(sce==NULL) {
-		if(GS(id->name) == ID_MA)
-			free_material((Material*)id);
-		return;
-	}
+	if(sce==NULL) return;
 	
 	if(!split || first) sprintf(name, "Preview %p", sp->owner);
 	else sprintf(name, "SecondPreview %p", sp->owner);
@@ -961,9 +954,6 @@
 
 	/* unassign the pointers, reset vars */
 	preview_prepare_scene(sp->scene, NULL, GS(id->name), NULL);
-
-	if(GS(id->name) == ID_MA)
-		free_material((Material*)id);
 }
 
 /* runs inside thread for material and icons */