[Bf-blender-cvs] [bfdb9f9] master: Cycles: Remove Integrator volume sampling flag, that was moved to Shader.

[Thomas Dinges]

Commit: bfdb9f9e0f1aa4f22138bfb023c4348b19c9eeeb
Author: Thomas Dinges
Date:   Sun Nov 16 19:49:41 2014 +0100
Branches: master
https://developer.blender.org/rBbfdb9f9e0f1aa4f22138bfb023c4348b19c9eeeb

Cycles: Remove Integrator volume sampling flag, that was moved to Shader.

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

M       intern/cycles/app/cycles_xml.cpp
M       intern/cycles/render/integrator.cpp
M       intern/cycles/render/integrator.h

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

diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 431796e..9ce16d8 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -299,7 +299,6 @@ static void xml_read_integrator(const XMLReadState& state, 
pugi::xml_node node)
        xml_read_bool(&integrator->transparent_shadows, node, 
"transparent_shadows");
        
        /* Volume */
-       xml_read_int(&integrator->volume_homogeneous_sampling, node, 
"volume_homogeneous_sampling");
        xml_read_float(&integrator->volume_step_size, node, "volume_step_size");
        xml_read_int(&integrator->volume_max_steps, node, "volume_max_steps");
        
diff --git a/intern/cycles/render/integrator.cpp 
b/intern/cycles/render/integrator.cpp
index 03a8cd5..ae7cc30 100644
--- a/intern/cycles/render/integrator.cpp
+++ b/intern/cycles/render/integrator.cpp
@@ -39,7 +39,6 @@ Integrator::Integrator()
        transparent_max_bounce = max_bounce;
        transparent_shadows = false;
 
-       volume_homogeneous_sampling = 0;
        volume_max_steps = 1024;
        volume_step_size = 0.1f;
 
@@ -189,7 +188,6 @@ bool Integrator::modified(const Integrator& integrator)
                transparent_min_bounce == integrator.transparent_min_bounce &&
                transparent_max_bounce == integrator.transparent_max_bounce &&
                transparent_shadows == integrator.transparent_shadows &&
-               volume_homogeneous_sampling == 
integrator.volume_homogeneous_sampling &&
                volume_max_steps == integrator.volume_max_steps &&
                volume_step_size == integrator.volume_step_size &&
                caustics_reflective == integrator.caustics_reflective &&
diff --git a/intern/cycles/render/integrator.h 
b/intern/cycles/render/integrator.h
index 13c10e8..110c354 100644
--- a/intern/cycles/render/integrator.h
+++ b/intern/cycles/render/integrator.h
@@ -39,7 +39,6 @@ public:
        int transparent_max_bounce;
        bool transparent_shadows;
 
-       int volume_homogeneous_sampling;
        int volume_max_steps;
        float volume_step_size;

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs