Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Cleanup, style

Browse Source
This commit is contained in:
Sergey Sharybin
2017-04-18 11:39:21 +02:00
parent 968d86afc3
commit f970e859cf
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/opencl/opencl_util.cpp
View File

@@ -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 OpenCLInfo::get_platform_name(cl_platform_id platform_id)
{ {
string platform_name; string platform_name;
if (!get_platform_name(platform_id, &platform_name)) { if(!get_platform_name(platform_id, &platform_name)) {
return ""; return "";
} }
return platform_name; return platform_name;

2
intern/cycles/kernel/kernel_shadow.h
View File

@@ -379,7 +379,7 @@ ccl_device bool shadow_blocked_transparent_stepped(
float3 *shadow) float3 *shadow)
{ {
bool blocked, is_transparent_isect; bool blocked, is_transparent_isect;
if (skip_object == OBJECT_NONE) { if(skip_object == OBJECT_NONE) {
blocked = scene_intersect(kg, blocked = scene_intersect(kg,
*ray, *ray,
PATH_RAY_SHADOW_OPAQUE, PATH_RAY_SHADOW_OPAQUE,

2
intern/cycles/kernel/split/kernel_holdout_emission_blurring_pathtermination_ao.h
View File

@@ -122,7 +122,7 @@ ccl_device void kernel_holdout_emission_blurring_pathtermination_ao(
#ifdef __SHADOW_TRICKS__ #ifdef __SHADOW_TRICKS__
if((sd->object_flag & SD_OBJECT_SHADOW_CATCHER)) { 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->flag |= (PATH_RAY_SHADOW_CATCHER | PATH_RAY_SHADOW_CATCHER_ONLY);
state->catcher_object = sd->object; state->catcher_object = sd->object;
if(!kernel_data.background.transparent) { if(!kernel_data.background.transparent) {