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:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-11-07 15:57:16 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-11-07 15:57:16 +0300
commit3cfbdc2bb43796545c27239a2a3a339e355e96a9 (patch)
tree3264cca91cba0135cce42a766d798bd16c7470f9 /intern/cycles/render
parentc83b171794fcdd57a9d880750da22b62d2cd1e3d (diff)
parent1a1fb5a47cd03a85b350825ecd46b0ea7a160319 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/render')
-rw-r--r--intern/cycles/render/object.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index a12a0d297f0..c70111d15b0 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -264,7 +264,7 @@ bool Object::is_traceable()
uint Object::visibility_for_tracing() const {
uint trace_visibility = visibility;
- if (is_shadow_catcher) {
+ if(is_shadow_catcher) {
trace_visibility &= ~PATH_RAY_SHADOW_NON_CATCHER;
}
else {