Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Dinges <blender@dingto.org>2013-08-30 20:39:39 +0400
committerThomas Dinges <blender@dingto.org>2013-08-30 20:39:39 +0400
commit0502fc0112beb2dc0ea8b029fdde6e781f820404 (patch)
treec6380a1210141f997b112f59451c78f49cdef9db /intern/cycles/app/cycles_xml.cpp
parent86f8470a5da2efbd8d521df2759b3a0d06160667 (diff)
Cycles Standalone:
* Fix compiler warning, == / = mismatch.
Diffstat (limited to 'intern/cycles/app/cycles_xml.cpp')
-rw-r--r--intern/cycles/app/cycles_xml.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index 8c6f501249a..55a2a30b9a8 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -257,7 +257,7 @@ static void xml_read_integrator(const XMLReadState& state, pugi::xml_node node)
xml_read_bool(&branched, node, "branched");
if(branched)
- integrator->method == Integrator::BRANCHED_PATH;
+ integrator->method = Integrator::BRANCHED_PATH;
if(integrator->method == Integrator::BRANCHED_PATH) {
xml_read_int(&integrator->diffuse_samples, node, "diffuse_samples");