archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Cleanup: style

Browse Source
This commit is contained in:
Campbell Barton
2018-02-15 11:13:54 +11:00
parent 56fa48969e
commit 70f1b8cc40
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
source/blender/blenkernel/intern/addon.c
View File

@@ -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"

2
source/blender/blenlib/BLI_hash.h
View File

@@ -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__

3
source/blender/blenlib/intern/math_base_inline.c
View File

@@ -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;

2
source/blender/nodes/shader/nodes/node_shader_displacement.c
View File

@@ -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 {

4
source/blender/nodes/shader/nodes/node_shader_vector_displacement.c
View File

@@ -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 {