griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: Code cleanup, spaces around keywords

Browse Source 
This inconsistency drove me totally crazy, it's really confusing
when it's inconsistent especially when you work on both Cycles and
Blender sides.

Shouldn;t cause merge PITA, it's whitespace changes only, Git should
be able to merge it nicely.
This commit is contained in:
Sergey Sharybin
2015-03-28 00:15:15 +05:00
parent 6f43e1dfef
commit 5ff132182d
63 changed files with 384 additions and 384 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/kernel/kernel.cpp
View File

@@ -55,7 +55,7 @@ void kernel_tex_copy(KernelGlobals *kg, const char *name, device_ptr mem, size_t
int id = atoi(name + strlen("__tex_image_float_"));
int array_index = id;
if (array_index >= 0 && array_index < MAX_FLOAT_IMAGES) {
if(array_index >= 0 && array_index < MAX_FLOAT_IMAGES) {
tex = &kg->texture_float_images[array_index];
}
@@ -70,7 +70,7 @@ void kernel_tex_copy(KernelGlobals *kg, const char *name, device_ptr mem, size_t
int id = atoi(name + strlen("__tex_image_"));
int array_index = id - MAX_FLOAT_IMAGES;
if (array_index >= 0 && array_index < MAX_BYTE_IMAGES) {
if(array_index >= 0 && array_index < MAX_BYTE_IMAGES) {
tex = &kg->texture_byte_images[array_index];
}