[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59883] trunk/blender/intern/cycles: Code cleanup / Cycles:

[Thomas Dinges]

Revision: 59883
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59883
Author:   dingto
Date:     2013-09-06 16:07:49 +0000 (Fri, 06 Sep 2013)
Log Message:
-----------
Code cleanup / Cycles:
* Some cleanup for disabled Volume code. 

Modified Paths:
--------------
    trunk/blender/intern/cycles/blender/addon/ui.py
    trunk/blender/intern/cycles/render/nodes.cpp

Modified: trunk/blender/intern/cycles/blender/addon/ui.py
===================================================================
--- trunk/blender/intern/cycles/blender/addon/ui.py	2013-09-06 16:03:15 UTC (rev 59882)
+++ trunk/blender/intern/cycles/blender/addon/ui.py	2013-09-06 16:07:49 UTC (rev 59883)
@@ -811,7 +811,6 @@
 
     def draw(self, context):
         layout = self.layout
-        layout.active = False
 
         world = context.world
         panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Volume')
@@ -957,7 +956,6 @@
 
     def draw(self, context):
         layout = self.layout
-        layout.active = False
 
         mat = context.material
         cmat = mat.cycles

Modified: trunk/blender/intern/cycles/render/nodes.cpp
===================================================================
--- trunk/blender/intern/cycles/render/nodes.cpp	2013-09-06 16:03:15 UTC (rev 59882)
+++ trunk/blender/intern/cycles/render/nodes.cpp	2013-09-06 16:07:49 UTC (rev 59883)
@@ -1872,7 +1872,7 @@
 VolumeNode::VolumeNode()
 : ShaderNode("volume")
 {
-	closure = ccl::CLOSURE_VOLUME_ISOTROPIC_ID;
+	closure = CLOSURE_VOLUME_ISOTROPIC_ID;
 
 	add_input("Color", SHADER_SOCKET_COLOR, make_float3(0.8f, 0.8f, 0.8f));
 	add_input("Density", SHADER_SOCKET_FLOAT, 1.0f);
@@ -1930,7 +1930,7 @@
 
 void TransparentVolumeNode::compile(OSLCompiler& compiler)
 {
-	compiler.add(this, "node_isotropic_volume");
+	compiler.add(this, "node_transparent_volume");
 }
 
 /* Isotropic Volume Closure */