Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Code cleanup / Cycles:

Browse Source 
* Some cleanup for disabled Volume code.
This commit is contained in:
Thomas Dinges
2013-09-06 16:07:49 +00:00
parent f9c901e84d
commit da2c76d9f7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/blender/addon/ui.py
View File

@@ -811,7 +811,6 @@ class CyclesWorld_PT_volume(CyclesButtonsPanel, Panel):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.active = False
world = context.world world = context.world
panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Volume') panel_node_draw(layout, world, 'OUTPUT_WORLD', 'Volume')
@@ -957,7 +956,6 @@ class CyclesMaterial_PT_volume(CyclesButtonsPanel, Panel):
def draw(self, context): def draw(self, context):
layout = self.layout layout = self.layout
layout.active = False
mat = context.material mat = context.material
cmat = mat.cycles cmat = mat.cycles

4
intern/cycles/render/nodes.cpp
View File

@@ -1872,7 +1872,7 @@ void AmbientOcclusionNode::compile(OSLCompiler& compiler)
VolumeNode::VolumeNode() VolumeNode::VolumeNode()
: ShaderNode("volume") : 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("Color", SHADER_SOCKET_COLOR, make_float3(0.8f, 0.8f, 0.8f));
add_input("Density", SHADER_SOCKET_FLOAT, 1.0f); add_input("Density", SHADER_SOCKET_FLOAT, 1.0f);
@@ -1930,7 +1930,7 @@ void TransparentVolumeNode::compile(SVMCompiler& compiler)
void TransparentVolumeNode::compile(OSLCompiler& compiler) void TransparentVolumeNode::compile(OSLCompiler& compiler)
{ {
compiler.add(this, "node_isotropic_volume"); compiler.add(this, "node_transparent_volume");
} }
/* Isotropic Volume Closure */ /* Isotropic Volume Closure */