blender
/
blender
130
398
Fork 575
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: warnings, trailing space

This commit is contained in:
Campbell Barton 2018-08-02 08:26:24 +10:00
parent 504454ee5e
commit 918288138d
6 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/BKE_shader_fx.h
View File

@ -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.
*

2
source/blender/blenkernel/intern/subdiv_eval.c
View File

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

3
source/blender/draw/engines/gpencil/shaders/fx/gpencil_fx_rim_resolve_frag.glsl
View File

@ -96,6 +96,3 @@ void main()
gl_FragDepth = stroke_depth;
FragColor = outcolor;
}

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

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

2
source/blender/shader_fx/CMakeLists.txt
View File

@ -19,7 +19,7 @@
#
# ***** END GPL LICENSE BLOCK *****
set(INC
set(INC
.
intern
../blenkernel

1
source/blender/shader_fx/intern/FX_shader_util.c
View File

@ -53,4 +53,3 @@ void shaderfx_type_init(ShaderFxTypeInfo *types[])
INIT_FX_TYPE(Wave);
#undef INIT_FX_TYPE
}