[Bf-blender-cvs] [1a1fb5a47cd] master: Cycles: Cleanup, style

Sergey Sharybin noreply at git.blender.org
Tue Nov 7 13:57:07 CET 2017


Commit: 1a1fb5a47cd03a85b350825ecd46b0ea7a160319
Author: Sergey Sharybin
Date:   Tue Nov 7 13:55:58 2017 +0100
Branches: master
https://developer.blender.org/rB1a1fb5a47cd03a85b350825ecd46b0ea7a160319

Cycles: Cleanup, style

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

M	intern/cycles/blender/blender_sync.cpp
M	intern/cycles/render/object.cpp

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

diff --git a/intern/cycles/blender/blender_sync.cpp b/intern/cycles/blender/blender_sync.cpp
index b070bf89d44..142fd5ef85b 100644
--- a/intern/cycles/blender/blender_sync.cpp
+++ b/intern/cycles/blender/blender_sync.cpp
@@ -573,7 +573,8 @@ array<Pass> BlenderSync::sync_render_passes(BL::RenderLayer& b_rlay,
 
 	PointerRNA crp = RNA_pointer_get(&b_srlay.ptr, "cycles");
 	if(get_boolean(crp, "denoising_store_passes") &&
-	   get_boolean(crp, "use_denoising")) {
+	   get_boolean(crp, "use_denoising"))
+	{
 		b_engine.add_pass("Denoising Normal",          3, "XYZ", b_srlay.name().c_str());
 		b_engine.add_pass("Denoising Normal Variance", 3, "XYZ", b_srlay.name().c_str());
 		b_engine.add_pass("Denoising Albedo",          3, "RGB", b_srlay.name().c_str());
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 {



More information about the Bf-blender-cvs mailing list