Commit: 70f1b8cc4061fac81413c723b973386050e2561e
Author: Campbell Barton
Date:   Thu Feb 15 11:13:54 2018 +1100
Branches: master
https://developer.blender.org/rB70f1b8cc4061fac81413c723b973386050e2561e

Cleanup: style

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

M       source/blender/blenkernel/intern/addon.c
M       source/blender/blenlib/BLI_hash.h
M       source/blender/blenlib/intern/math_base_inline.c
M       source/blender/nodes/shader/nodes/node_shader_displacement.c
M       source/blender/nodes/shader/nodes/node_shader_vector_displacement.c

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

diff --git a/source/blender/blenkernel/intern/addon.c 
b/source/blender/blenkernel/intern/addon.c
index 8a5154f0039..689e0fb5ee6 100644
--- a/source/blender/blenkernel/intern/addon.c
+++ b/source/blender/blenkernel/intern/addon.c
@@ -33,7 +33,6 @@
 #include "BLI_ghash.h"
 #include "BLI_string.h"
 #include "BLI_listbase.h"
-#include "BLI_utildefines.h"
 
 #include "BKE_addon.h"  /* own include */
 #include "BKE_idprop.h"
diff --git a/source/blender/blenlib/BLI_hash.h 
b/source/blender/blenlib/BLI_hash.h
index 8b797820722..fa79481e25c 100644
--- a/source/blender/blenlib/BLI_hash.h
+++ b/source/blender/blenlib/BLI_hash.h
@@ -65,7 +65,7 @@ BLI_INLINE unsigned int BLI_hash_int(unsigned int k)
 
 BLI_INLINE float BLI_hash_int_01(unsigned int k)
 {
-       return (float)BLI_hash_int(k) * (1.0f/(float)0xFFFFFFFF);
+       return (float)BLI_hash_int(k) * (1.0f / (float)0xFFFFFFFF);
 }
 
 #endif // __BLI_HASH_H__
diff --git a/source/blender/blenlib/intern/math_base_inline.c 
b/source/blender/blenlib/intern/math_base_inline.c
index 144198f2c06..1f517471407 100644
--- a/source/blender/blenlib/intern/math_base_inline.c
+++ b/source/blender/blenlib/intern/math_base_inline.c
@@ -333,7 +333,8 @@ MINLINE float clamp_f(float value, float min, float max)
 {
        if (value > max) {
                return max;
-       } else if (value < min) {
+       }
+       else if (value < min) {
                return min;
        }
        return value;
diff --git a/source/blender/nodes/shader/nodes/node_shader_displacement.c 
b/source/blender/nodes/shader/nodes/node_shader_displacement.c
index e976eaf143a..e259a9e3f6d 100644
--- a/source/blender/nodes/shader/nodes/node_shader_displacement.c
+++ b/source/blender/nodes/shader/nodes/node_shader_displacement.c
@@ -60,7 +60,7 @@ static int gpu_shader_displacement(GPUMaterial *mat, bNode 
*node, bNodeExecData
                GPU_link(mat, "direction_transform_m4v3", 
GPU_builtin(GPU_VIEW_NORMAL), GPU_builtin(GPU_INVERSE_VIEW_MATRIX), 
&in[3].link);
        }
 
-       if(node->custom1 == SHD_SPACE_OBJECT) {
+       if (node->custom1 == SHD_SPACE_OBJECT) {
                return GPU_stack_link(mat, "node_displacement_object", in, out, 
GPU_builtin(GPU_OBJECT_MATRIX));
        }
        else {
diff --git 
a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c 
b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
index c40377c3d59..073bc3110f6 100644
--- a/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
+++ b/source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
@@ -48,7 +48,7 @@ static void node_shader_init_vector_displacement(bNodeTree 
*UNUSED(ntree), bNode
 
 static int gpu_shader_vector_displacement(GPUMaterial *mat, bNode *node, 
bNodeExecData *UNUSED(execdata), GPUNodeStack *in, GPUNodeStack *out)
 {
-       if(node->custom1 == SHD_SPACE_TANGENT) {
+       if (node->custom1 == SHD_SPACE_TANGENT) {
                return GPU_stack_link(mat,
                                      "node_vector_displacement_tangent",
                                      in,
@@ -58,7 +58,7 @@ static int gpu_shader_vector_displacement(GPUMaterial *mat, 
bNode *node, bNodeEx
                                      GPU_builtin(GPU_OBJECT_MATRIX),
                                      GPU_builtin(GPU_VIEW_MATRIX));
        }
-       else if(node->custom1 == SHD_SPACE_OBJECT) {
+       else if (node->custom1 == SHD_SPACE_OBJECT) {
                return GPU_stack_link(mat, "node_vector_displacement_object", 
in, out, GPU_builtin(GPU_OBJECT_MATRIX));
        }
        else {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to