diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-08-02 01:26:24 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-08-02 01:26:57 +0300 |
commit | 918288138d19c7cd7936705bef7947d941abe708 (patch) | |
tree | 7eb58fa2dd06cbbdaf1d5c00e7b0d49fa004aae8 /source/blender/blenkernel | |
parent | 504454ee5ec608de89b07476a8abb91b70ca12a2 (diff) |
Cleanup: warnings, trailing space
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r-- | source/blender/blenkernel/BKE_shader_fx.h | 8 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_eval.c | 2 |
2 files changed, 5 insertions, 5 deletions
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 } |