diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-09-06 20:07:49 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-09-06 20:07:49 +0400 |
| commit | da2c76d9f7e1a29ad91ab8aaf95bb912800296a4 (patch) | |
| tree | 9bf4f3ade0cda66dddc9209c0e7f8a2683eef49d | |
| parent | f9c901e84d235aa2ab0e58130bf28c2fcbd6f1f1 (diff) | |
Code cleanup / Cycles:
* Some cleanup for disabled Volume code.
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 2 | ||||
| -rw-r--r-- | intern/cycles/render/nodes.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 18b68ca3e9d..012fc9ea44c 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -811,7 +811,6 @@ class CyclesWorld_PT_volume(CyclesButtonsPanel, Panel): 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 @@ class CyclesMaterial_PT_volume(CyclesButtonsPanel, Panel): def draw(self, context): layout = self.layout - layout.active = False mat = context.material cmat = mat.cycles diff --git a/intern/cycles/render/nodes.cpp b/intern/cycles/render/nodes.cpp index 22bca659072..30f51728e1b 100644 --- a/intern/cycles/render/nodes.cpp +++ b/intern/cycles/render/nodes.cpp @@ -1872,7 +1872,7 @@ void AmbientOcclusionNode::compile(OSLCompiler& compiler) 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(SVMCompiler& compiler) void TransparentVolumeNode::compile(OSLCompiler& compiler) { - compiler.add(this, "node_isotropic_volume"); + compiler.add(this, "node_transparent_volume"); } /* Isotropic Volume Closure */ |