[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [33810] trunk/blender/source/blender/ editors/render/render_preview.c: Bugfix #25307
Ton Roosendaal
ton at blender.org
Mon Dec 20 12:33:52 CET 2010
Revision: 33810
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=33810
Author: ton
Date: 2010-12-20 12:33:52 +0100 (Mon, 20 Dec 2010)
Log Message:
-----------
Bugfix #25307
Node shaders + textures, showing in Texture properties, with option
"show both previews" had bad ID checking.
Modified Paths:
--------------
trunk/blender/source/blender/editors/render/render_preview.c
Modified: trunk/blender/source/blender/editors/render/render_preview.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_preview.c 2010-12-20 11:21:29 UTC (rev 33809)
+++ trunk/blender/source/blender/editors/render/render_preview.c 2010-12-20 11:33:52 UTC (rev 33810)
@@ -918,11 +918,13 @@
static void shader_preview_updatejob(void *spv)
{
ShaderPreview *sp= spv;
- Material *mat= (Material *)sp->id;
- if(sp->matcopy && mat->nodetree)
- ntreeLocalSync(sp->matcopy->nodetree, mat->nodetree);
-
+ if(sp->id && GS(sp->id->name) == ID_MA) {
+ Material *mat= (Material *)sp->id;
+
+ if(sp->matcopy && mat->nodetree && sp->matcopy->nodetree)
+ ntreeLocalSync(sp->matcopy->nodetree, mat->nodetree);
+ }
}
static void shader_preview_render(ShaderPreview *sp, ID *id, int split, int first)
More information about the Bf-blender-cvs
mailing list