[Bf-blender-cvs] [628e7ec] soc-2013-paint: Correct DM_DRAW_USE_ACTIVE_UV, was defined as (DM_DRAW_USE_COLORS | DM_DRAW_ALWAYS_SMOOTH)

[Campbell Barton]

Commit: 628e7ecd44e34a06363f38f8e25fa1f66794bc53
Author: Campbell Barton
Date:   Mon Jun 23 22:32:43 2014 +1000
https://developer.blender.org/rB628e7ecd44e34a06363f38f8e25fa1f66794bc53

Correct DM_DRAW_USE_ACTIVE_UV, was defined as (DM_DRAW_USE_COLORS | 
DM_DRAW_ALWAYS_SMOOTH)

also cleanup headers in paint_curve.c

===================================================================

M       source/blender/blenkernel/BKE_DerivedMesh.h
M       source/blender/editors/sculpt_paint/paint_curve.c

===================================================================

diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h 
b/source/blender/blenkernel/BKE_DerivedMesh.h
index 2acdb5c..6fe6171 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -150,10 +150,10 @@ typedef DMDrawOption (*DMSetDrawOptions)(void *userData, 
int index);
 typedef DMDrawOption (*DMSetDrawOptionsTex)(struct MTFace *tface, const bool 
has_vcol, int matnr);
 
 typedef enum DMDrawFlag {
-       DM_DRAW_USE_COLORS = 1,
-       DM_DRAW_ALWAYS_SMOOTH = 2,
-       DM_DRAW_USE_ACTIVE_UV = 3,
-       DM_DRAW_USE_TEXPAINT_UV = 4
+       DM_DRAW_USE_COLORS          = (1 << 0),
+       DM_DRAW_ALWAYS_SMOOTH       = (1 << 1),
+       DM_DRAW_USE_ACTIVE_UV       = (1 << 2),
+       DM_DRAW_USE_TEXPAINT_UV     = (1 << 4),
 } DMDrawFlag;
 
 typedef enum DMForeachFlag {
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c 
b/source/blender/editors/sculpt_paint/paint_curve.c
index f3bd8e2..ec4f693 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -18,12 +18,17 @@
  * ***** END GPL LICENSE BLOCK *****
  */
 
+/** \file blender/editors/sculpt_paint/paint_curve.c
+ *  \ingroup edsculpt
+ */
+
+#include <string.h>
+#include <limits.h>
+
 #include "MEM_guardedalloc.h"
 
 #include "DNA_brush_types.h"
-#include "DNA_curve_types.h"
 #include "DNA_object_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 #include "DNA_space_types.h"
 #include "DNA_view3d_types.h"
@@ -38,7 +43,6 @@
 #include "ED_paint.h"
 
 #include "WM_api.h"
-#include "WM_keymap.h"
 #include "WM_types.h"
 
 #include "RNA_access.h"
@@ -46,8 +50,6 @@
 
 #include "paint_intern.h"
 
-#include <string.h>
-#include <limits.h>
 
 int paintcurve_poll(bContext *C)
 {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs