[Bf-blender-cvs] [b757f04] master: Cycles: Indentation fix for the previous commit

Sergey Sharybin noreply at git.blender.org
Sun Feb 1 22:05:06 CET 2015


Commit: b757f04a1590c6f670b268811b64dbcbf5f6da30
Author: Sergey Sharybin
Date:   Mon Feb 2 02:04:47 2015 +0500
Branches: master
https://developer.blender.org/rBb757f04a1590c6f670b268811b64dbcbf5f6da30

Cycles: Indentation fix for the previous commit

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

M	intern/cycles/kernel/kernel_compat_cpu.h

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

diff --git a/intern/cycles/kernel/kernel_compat_cpu.h b/intern/cycles/kernel/kernel_compat_cpu.h
index 76167d0..cef94d1 100644
--- a/intern/cycles/kernel/kernel_compat_cpu.h
+++ b/intern/cycles/kernel/kernel_compat_cpu.h
@@ -72,12 +72,12 @@ template<typename T> struct texture  {
 
 template<typename T> struct texture_image  {
 #define SET_CUBIC_SPLINE_WEIGHTS(u, t) \
-			{ \
-				u[0] = (((-1.0f/6.0f)* t + 0.5f) * t - 0.5f) * t + (1.0f/6.0f); \
-				u[1] =  ((      0.5f * t - 1.0f) * t       ) * t + (2.0f/3.0f); \
-				u[2] =  ((     -0.5f * t + 0.5f) * t + 0.5f) * t + (1.0f/6.0f); \
-				u[3] = (1.0f / 6.0f) * t * t * t; \
-			} (void)0
+	{ \
+		u[0] = (((-1.0f/6.0f)* t + 0.5f) * t - 0.5f) * t + (1.0f/6.0f); \
+		u[1] =  ((      0.5f * t - 1.0f) * t       ) * t + (2.0f/3.0f); \
+		u[2] =  ((     -0.5f * t + 0.5f) * t + 0.5f) * t + (1.0f/6.0f); \
+		u[3] = (1.0f / 6.0f) * t * t * t; \
+	} (void)0
 
 	ccl_always_inline float4 read(float4 r)
 	{




More information about the Bf-blender-cvs mailing list