[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41069] branches/cycles/intern/cycles/ blender: Cycles: material "sample as light" option, to make the integrator sample the

[Brecht Van Lommel]

Revision: 41069
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41069
Author:   blendix
Date:     2011-10-16 20:58:48 +0000 (Sun, 16 Oct 2011)
Log Message:
-----------
Cycles: material "sample as light" option, to make the integrator sample the
object as a mesh light or not. This may result in more/less noisy renders
depending on the situation, but should converge to the same result.

Modified Paths:
--------------
    branches/cycles/intern/cycles/blender/addon/properties.py
    branches/cycles/intern/cycles/blender/blender_shader.cpp

Modified: branches/cycles/intern/cycles/blender/addon/properties.py
===================================================================
--- branches/cycles/intern/cycles/blender/addon/properties.py	2011-10-16 18:54:27 UTC (rev 41068)
+++ branches/cycles/intern/cycles/blender/addon/properties.py	2011-10-16 20:58:48 UTC (rev 41069)
@@ -118,7 +118,7 @@
     @classmethod
     def register(cls):
         bpy.types.Material.cycles = PointerProperty(type=cls, name="Cycles Material Settings", description="Cycles material settings")
-        cls.sample_as_light = BoolProperty(name="Sample as Light", description="Use direct light sampling, to reduce noise for small or strong emitting materials", default=False)
+        cls.sample_as_light = BoolProperty(name="Sample as Light", description="Use direct light sampling, to reduce noise for small or strong emitting materials", default=True)
         cls.homogeneous_volume = BoolProperty(name="Homogeneous Volume", description="When using volume rendering, assume volume has the same density everywhere, for faster rendering", default=False)
 
     @classmethod

Modified: branches/cycles/intern/cycles/blender/blender_shader.cpp
===================================================================
--- branches/cycles/intern/cycles/blender/blender_shader.cpp	2011-10-16 18:54:27 UTC (rev 41068)
+++ branches/cycles/intern/cycles/blender/blender_shader.cpp	2011-10-16 20:58:48 UTC (rev 41069)
@@ -613,7 +613,7 @@
 
 			/* settings */
 			PointerRNA cmat = RNA_pointer_get(&b_mat->ptr, "cycles");
-			//shader->sample_as_light = get_boolean(cmat, "sample_as_light");
+			shader->sample_as_light = get_boolean(cmat, "sample_as_light");
 			shader->homogeneous_volume = get_boolean(cmat, "homogeneous_volume");
 
 			shader->set_graph(graph);