[Bf-blender-cvs] [1239c26] master: Blender Internal: Fix material preview that the bounce lights permanently disappear once volume material is used.

[IRIE Shinsuke]

Commit: 1239c265cb809c618c0b7481219597b48c02f855
Author: IRIE Shinsuke
Date:   Tue Nov 26 15:33:31 2013 +0900
http://developer.blender.org/rB1239c265cb809c618c0b7481219597b48c02f855

Blender Internal: Fix material preview that the bounce lights permanently disappear once volume material is used.

===================================================================

M	source/blender/editors/render/render_preview.c

===================================================================

diff --git a/source/blender/editors/render/render_preview.c b/source/blender/editors/render/render_preview.c
index 2bf8a48..081187e 100644
--- a/source/blender/editors/render/render_preview.c
+++ b/source/blender/editors/render/render_preview.c
@@ -358,13 +358,14 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre
 					
 					/* turn off bounce lights for volume, 
 					 * doesn't make much visual difference and slows it down too */
-					if (mat->material_type == MA_TYPE_VOLUME) {
-						for (base = sce->base.first; base; base = base->next) {
-							if (base->object->type == OB_LAMP) {
-								/* if doesn't match 'Lamp.002' --> main key light */
-								if (strcmp(base->object->id.name + 2, "Lamp.002") != 0) {
+					for (base = sce->base.first; base; base = base->next) {
+						if (base->object->type == OB_LAMP) {
+							/* if doesn't match 'Lamp.002' --> main key light */
+							if (strcmp(base->object->id.name + 2, "Lamp.002") != 0) {
+								if (mat->material_type == MA_TYPE_VOLUME)
 									base->object->restrictflag |= OB_RESTRICT_RENDER;
-								}
+								else
+									base->object->restrictflag &= ~OB_RESTRICT_RENDER;
 							}
 						}
 					}