[Bf-blender-cvs] [918288138d1] blender2.8: Cleanup: warnings, trailing space
Campbell Barton
noreply at git.blender.org
Thu Aug 2 00:26:24 CEST 2018
Commit: 918288138d19c7cd7936705bef7947d941abe708
Author: Campbell Barton
Date: Thu Aug 2 08:26:24 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB918288138d19c7cd7936705bef7947d941abe708
Cleanup: warnings, trailing space
===================================================================
M source/blender/blenkernel/BKE_shader_fx.h
M source/blender/blenkernel/intern/subdiv_eval.c
M source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl
M source/blender/nodes/shader/nodes/node_shader_mapping.c
M source/blender/shader_fx/CMakeLists.txt
M source/blender/shader_fx/intern/FX_shader_util.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_shader_fx.h b/source/blender/blenkernel/BKE_shader_fx.h
index 11c5983106a..d2c8cfb457c 100644
--- a/source/blender/blenkernel/BKE_shader_fx.h
+++ b/source/blender/blenkernel/BKE_shader_fx.h
@@ -48,7 +48,7 @@ struct bGPDstroke;
struct ModifierUpdateDepsgraphContext;
#define SHADER_FX_ACTIVE(_fx, _is_render) (((_fx->mode & eShaderFxMode_Realtime) && (_is_render == false)) || \
- ((_fx->mode & eShaderFxMode_Render) && (_is_render == true)))
+ ((_fx->mode & eShaderFxMode_Render) && (_is_render == true)))
#define SHADER_FX_EDIT(_fx, _is_edit) (((_fx->mode & eShaderFxMode_Editmode) == 0) && (_is_edit))
typedef enum {
@@ -63,7 +63,7 @@ typedef enum {
eShaderFxTypeFlag_SupportsEditmode = (1 << 0),
/* For effects that support editmode this determines if the
- * effect should be enabled by default in editmode.
+ * effect should be enabled by default in editmode.
*/
eShaderFxTypeFlag_EnableInEditmode = (1 << 2),
@@ -101,7 +101,7 @@ typedef struct ShaderFxTypeInfo {
/* Initialize new instance data for this effect type, this function
* should set effect variables to their default values.
- *
+ *
* This function is optional.
*/
void (*initData)(struct ShaderFxData *fx);
@@ -129,7 +129,7 @@ typedef struct ShaderFxTypeInfo {
*/
void (*updateDepsgraph)(struct ShaderFxData *fx,
const struct ModifierUpdateDepsgraphContext *ctx);
-
+
/* Should return true if the effect needs to be recalculated on time
* changes.
*
diff --git a/source/blender/blenkernel/intern/subdiv_eval.c b/source/blender/blenkernel/intern/subdiv_eval.c
index fa9488f15b6..8621b1f87f9 100644
--- a/source/blender/blenkernel/intern/subdiv_eval.c
+++ b/source/blender/blenkernel/intern/subdiv_eval.c
@@ -231,7 +231,7 @@ void BKE_subdiv_eval_face_varying(
u, v,
face_varying);
#else
- UNUSED_VARS(subdiv, ptex_face_index, u, v, face_varying);
+ UNUSED_VARS(subdiv, face_varying_channel, ptex_face_index, u, v, face_varying);
#endif
}
diff --git a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl
index 20d6b8a91f8..0a7eb65d564 100644
--- a/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl
@@ -96,6 +96,3 @@ void main()
gl_FragDepth = stroke_depth;
FragColor = outcolor;
}
-
-
-
diff --git a/source/blender/nodes/shader/nodes/node_shader_mapping.c b/source/blender/nodes/shader/nodes/node_shader_mapping.c
index 2541b3bc842..98dcd58b983 100644
--- a/source/blender/nodes/shader/nodes/node_shader_mapping.c
+++ b/source/blender/nodes/shader/nodes/node_shader_mapping.c
@@ -88,8 +88,8 @@ static int gpu_shader_mapping(GPUMaterial *mat, bNode *node, bNodeExecData *UNUS
TexMapping *texmap = node->storage;
float domin = (texmap->flag & TEXMAP_CLIP_MIN) != 0;
float domax = (texmap->flag & TEXMAP_CLIP_MAX) != 0;
- static float max[3] = { FLT_MAX, FLT_MAX, FLT_MAX, 0.0};
- static float min[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX, 0.0};
+ static float max[3] = { FLT_MAX, FLT_MAX, FLT_MAX};
+ static float min[3] = {-FLT_MAX, -FLT_MAX, -FLT_MAX};
GPUNodeLink *tmin, *tmax, *tmat0, *tmat1, *tmat2, *tmat3;
tmin = GPU_uniform_buffer((domin) ? texmap->min : min, GPU_VEC3);
diff --git a/source/blender/shader_fx/CMakeLists.txt b/source/blender/shader_fx/CMakeLists.txt
index 2b33c9817c3..dacc0b3f063 100644
--- a/source/blender/shader_fx/CMakeLists.txt
+++ b/source/blender/shader_fx/CMakeLists.txt
@@ -19,7 +19,7 @@
#
# ***** END GPL LICENSE BLOCK *****
-set(INC
+set(INC
.
intern
../blenkernel
diff --git a/source/blender/shader_fx/intern/FX_shader_util.c b/source/blender/shader_fx/intern/FX_shader_util.c
index c55b9304503..64a1553adec 100644
--- a/source/blender/shader_fx/intern/FX_shader_util.c
+++ b/source/blender/shader_fx/intern/FX_shader_util.c
@@ -53,4 +53,3 @@ void shaderfx_type_init(ShaderFxTypeInfo *types[])
INIT_FX_TYPE(Wave);
#undef INIT_FX_TYPE
}
-
More information about the Bf-blender-cvs
mailing list