[Bf-blender-cvs] [908bb8bd825] master: Cycles: Cleanup, indentation in preprocessor

Sergey Sharybin noreply at git.blender.org
Fri May 19 12:55:03 CEST 2017


Commit: 908bb8bd825f4e1ffe32d56402b8458ac865c2c8
Author: Sergey Sharybin
Date:   Fri May 19 12:54:46 2017 +0200
Branches: master
https://developer.blender.org/rB908bb8bd825f4e1ffe32d56402b8458ac865c2c8

Cycles: Cleanup, indentation in preprocessor

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

M	intern/cycles/util/util_math_matrix.h

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

diff --git a/intern/cycles/util/util_math_matrix.h b/intern/cycles/util/util_math_matrix.h
index 0c58ae5058c..c1c6dbaa913 100644
--- a/intern/cycles/util/util_math_matrix.h
+++ b/intern/cycles/util/util_math_matrix.h
@@ -23,14 +23,14 @@ CCL_NAMESPACE_BEGIN
 
 /* Variants that use a constant stride on GPUS. */
 #ifdef __KERNEL_GPU__
-#define MATS(A, n, r, c, s) A[((r)*(n)+(c))*(s)]
+#  define MATS(A, n, r, c, s) A[((r)*(n)+(c))*(s)]
 /* Element access when only the lower-triangular elements are stored. */
-#define MATHS(A, r, c, s) A[((r)*((r)+1)/2+(c))*(s)]
-#define VECS(V, i, s) V[(i)*(s)]
+#  define MATHS(A, r, c, s) A[((r)*((r)+1)/2+(c))*(s)]
+#  define VECS(V, i, s) V[(i)*(s)]
 #else
-#define MATS(A, n, r, c, s) MAT(A, n, r, c)
-#define MATHS(A, r, c, s) A[(r)*((r)+1)/2+(c)]
-#define VECS(V, i, s) V[i]
+#  define MATS(A, n, r, c, s) MAT(A, n, r, c)
+#  define MATHS(A, r, c, s) A[(r)*((r)+1)/2+(c)]
+#  define VECS(V, i, s) V[i]
 #endif
 
 /* Zeroing helpers. */




More information about the Bf-blender-cvs mailing list