[Bf-blender-cvs] [f970e859cf9] master: Cycles: Cleanup, style
Sergey Sharybin
noreply at git.blender.org
Tue Apr 18 11:39:31 CEST 2017
Commit: f970e859cf964a33b31dcfeee4502f76908f1708
Author: Sergey Sharybin
Date: Tue Apr 18 11:39:21 2017 +0200
Branches: master
https://developer.blender.org/rBf970e859cf964a33b31dcfeee4502f76908f1708
Cycles: Cleanup, style
===================================================================
M intern/cycles/device/opencl/opencl_util.cpp
M intern/cycles/kernel/kernel_shadow.h
M intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
===================================================================
diff --git a/intern/cycles/device/opencl/opencl_util.cpp b/intern/cycles/device/opencl/opencl_util.cpp
index fe1c65a2224..38003dd1e1e 100644
--- a/intern/cycles/device/opencl/opencl_util.cpp
+++ b/intern/cycles/device/opencl/opencl_util.cpp
@@ -902,7 +902,7 @@ bool OpenCLInfo::get_platform_name(cl_platform_id platform_id,
string OpenCLInfo::get_platform_name(cl_platform_id platform_id)
{
string platform_name;
- if (!get_platform_name(platform_id, &platform_name)) {
+ if(!get_platform_name(platform_id, &platform_name)) {
return "";
}
return platform_name;
diff --git a/intern/cycles/kernel/kernel_shadow.h b/intern/cycles/kernel/kernel_shadow.h
index db6f839d9ed..fab5946970d 100644
--- a/intern/cycles/kernel/kernel_shadow.h
+++ b/intern/cycles/kernel/kernel_shadow.h
@@ -379,7 +379,7 @@ ccl_device bool shadow_blocked_transparent_stepped(
float3 *shadow)
{
bool blocked, is_transparent_isect;
- if (skip_object == OBJECT_NONE) {
+ if(skip_object == OBJECT_NONE) {
blocked = scene_intersect(kg,
*ray,
PATH_RAY_SHADOW_OPAQUE,
diff --git a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
index 9fc853a84bf..89adeb64c8a 100644
--- a/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
+++ b/intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
@@ -122,7 +122,7 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
#ifdef __SHADOW_TRICKS__
if((sd->object_flag & SD_OBJECT_SHADOW_CATCHER)) {
- if (state->flag & PATH_RAY_CAMERA) {
+ if(state->flag & PATH_RAY_CAMERA) {
state->flag |= (PATH_RAY_SHADOW_CATCHER | PATH_RAY_SHADOW_CATCHER_ONLY);
state->catcher_object = sd->object;
if(!kernel_data.background.transparent) {
More information about the Bf-blender-cvs
mailing list