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>2018-11-15 19:16:40 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-11-15 19:16:40 +0300
commitcd9ab9d99eb42cc61d3220447322f1c9adad6d21 (patch)
treeb556f060aebd0404f077de219a19282f19d66bbf /intern/cycles/kernel
parent74fdf68a413fe9fb6345903fa682ca1a46be3060 (diff)
Cycles: Cleanup, code style
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r--intern/cycles/kernel/bvh/bvh.h10
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp4
-rw-r--r--intern/cycles/kernel/svm/svm_closure.h4
3 files changed, 9 insertions, 9 deletions
diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h
index 72bba8d968f..6708a3efac1 100644
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -186,7 +186,7 @@ ccl_device_intersect bool scene_intersect(KernelGlobals *kg,
float difl,
float extmax)
{
- if (!scene_intersect_valid(&ray)) {
+ if(!scene_intersect_valid(&ray)) {
return false;
}
#ifdef __EMBREE__
@@ -248,7 +248,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
uint *lcg_state,
int max_hits)
{
- if (!scene_intersect_valid(&ray)) {
+ if(!scene_intersect_valid(&ray)) {
return false;
}
#ifdef __EMBREE__
@@ -327,7 +327,7 @@ ccl_device_intersect bool scene_intersect_shadow_all(KernelGlobals *kg,
uint max_hits,
uint *num_hits)
{
- if (!scene_intersect_valid(ray)) {
+ if(!scene_intersect_valid(ray)) {
return false;
}
# ifdef __EMBREE__
@@ -407,7 +407,7 @@ ccl_device_intersect bool scene_intersect_volume(KernelGlobals *kg,
Intersection *isect,
const uint visibility)
{
- if (!scene_intersect_valid(ray)) {
+ if(!scene_intersect_valid(ray)) {
return false;
}
# ifdef __OBJECT_MOTION__
@@ -438,7 +438,7 @@ ccl_device_intersect uint scene_intersect_volume_all(KernelGlobals *kg,
const uint max_hits,
const uint visibility)
{
- if (!scene_intersect_valid(ray)) {
+ if(!scene_intersect_valid(ray)) {
return false;
}
# ifdef __EMBREE__
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 5a82748f345..97f97a4887e 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -886,7 +886,7 @@ bool OSLRenderServices::has_userdata(ustring name, TypeDesc type, OSL::ShaderGlo
TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(ustring filename)
{
- if (filename.length() && filename[0] == '@') {
+ if(filename.length() && filename[0] == '@') {
/* Dummy, we don't use texture handles for builtin textures but need
* to tell the OSL runtime optimizer that this is a valid texture. */
return NULL;
@@ -1174,7 +1174,7 @@ bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg, ustring filenam
TypeDesc datatype, void *data)
{
OSL::TextureSystem *ts = osl_ts;
- if (filename.length() && filename[0] == '@') {
+ if(filename.length() && filename[0] == '@') {
/* Special builtin textures. */
return false;
}
diff --git a/intern/cycles/kernel/svm/svm_closure.h b/intern/cycles/kernel/svm/svm_closure.h
index e834d75c513..3cf33f4d431 100644
--- a/intern/cycles/kernel/svm/svm_closure.h
+++ b/intern/cycles/kernel/svm/svm_closure.h
@@ -262,7 +262,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
? (MicrofacetExtra*)closure_alloc_extra(sd, sizeof(MicrofacetExtra))
: NULL;
- if (bsdf && extra) {
+ if(bsdf && extra) {
bsdf->N = N;
bsdf->ior = (2.0f / (1.0f - safe_sqrtf(0.08f * specular))) - 1.0f;
bsdf->T = T;
@@ -314,7 +314,7 @@ ccl_device void svm_node_closure_bsdf(KernelGlobals *kg, ShaderData *sd, float *
? (MicrofacetExtra*)closure_alloc_extra(sd, sizeof(MicrofacetExtra))
: NULL;
- if (bsdf && extra) {
+ if(bsdf && extra) {
bsdf->N = N;
bsdf->T = make_float3(0.0f, 0.0f, 0.0f);
bsdf->extra = extra;