[Bf-blender-cvs] [8afd646] master: Blender Internal: Revert a part of rB162d6c73e3d0, that broke rendered preview and often causes crash when using material light group.
IRIE Shinsuke
noreply at git.blender.org
Mon Feb 17 08:57:12 CET 2014
Commit: 8afd646b18edbb66821dd35ded4c49cf9b436aa1
Author: IRIE Shinsuke
Date: Mon Feb 17 16:44:50 2014 +0900
https://developer.blender.org/rB8afd646b18edbb66821dd35ded4c49cf9b436aa1
Blender Internal: Revert a part of rB162d6c73e3d0, that broke rendered preview and often causes crash when using material light group.
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index f511ed8..57fb42c 100644
--- a/source/blender/render/intern/source/convertblender.c
+++ b/source/blender/render/intern/source/convertblender.c
@@ -3974,7 +3974,7 @@ static void set_material_lightgroups(Render *re)
Material *ma;
/* not for preview render */
- if (re->r.scemode & (R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))
+ if (re->scene->r.scemode & (R_BUTS_PREVIEW|R_VIEWPORT_PREVIEW))
return;
for (group= re->main->group.first; group; group=group->id.next)
More information about the Bf-blender-cvs
mailing list