diff options
author | Campbell Barton <ideasman42@gmail.com> | 2013-04-13 04:43:49 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2013-04-13 04:43:49 +0400 |
commit | 2f9b7410dc712961f5684e4892660167c693cda8 (patch) | |
tree | 8898f0650969eba414f105fcf7edba10627a2968 /source/blender/blenkernel/intern/paint.c | |
parent | 7cf1d86e4adc4893485e34229ccbc0537931c929 (diff) |
code cleanup: warnings + style
Diffstat (limited to 'source/blender/blenkernel/intern/paint.c')
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index e232e339603..ad7ac2a046b 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -29,7 +29,8 @@ * \ingroup bke */ - +#include <stdlib.h> +#include <string.h> #include "DNA_object_types.h" #include "DNA_mesh_types.h" @@ -51,9 +52,6 @@ #include "bmesh.h" -#include <stdlib.h> -#include <string.h> - const char PAINT_CURSOR_SCULPT[3] = {255, 100, 100}; const char PAINT_CURSOR_VERTEX_PAINT[3] = {255, 255, 255}; const char PAINT_CURSOR_WEIGHT_PAINT[3] = {200, 200, 255}; @@ -81,18 +79,20 @@ void BKE_paint_invalidate_cursor_overlay (Scene *scene, CurveMapping *curve) overlay_flags |= PAINT_INVALID_OVERLAY_CURVE; } -void BKE_paint_invalidate_overlay_all() +void BKE_paint_invalidate_overlay_all(void) { - overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY; - overlay_flags |= PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY; - overlay_flags |= PAINT_INVALID_OVERLAY_CURVE; + overlay_flags |= (PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY | + PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY | + PAINT_INVALID_OVERLAY_CURVE); } -int BKE_paint_get_overlay_flags () { +int BKE_paint_get_overlay_flags(void) +{ return overlay_flags; } -void BKE_paint_reset_overlay_invalid (void) { +void BKE_paint_reset_overlay_invalid(void) +{ overlay_flags &= ~(PAINT_INVALID_OVERLAY_TEXTURE_PRIMARY | PAINT_INVALID_OVERLAY_TEXTURE_SECONDARY | PAINT_INVALID_OVERLAY_CURVE); |