diff options
| author | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-02-17 11:44:50 +0400 |
|---|---|---|
| committer | IRIE Shinsuke <irieshinsuke@yahoo.co.jp> | 2014-02-17 11:57:11 +0400 |
| commit | 8afd646b18edbb66821dd35ded4c49cf9b436aa1 (patch) | |
| tree | da02c5b489473140e88cd723f6b102e8acab6c0b /source/blender/render | |
| parent | 05235d86eff257246ca2068f3acd3fdce0b944a2 (diff) | |
Blender Internal: Revert a part of rB162d6c73e3d0, that broke rendered preview and often causes crash when using material light group.
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index f511ed81ea6..57fb42cf20a 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) |