[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47427] trunk/blender: include cleanup, also raskter wasn't building on osx

[Campbell Barton]

Revision: 47427
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47427
Author:   campbellbarton
Date:     2012-06-04 17:27:22 +0000 (Mon, 04 Jun 2012)
Log Message:
-----------
include cleanup, also raskter wasn't building on osx

Modified Paths:
--------------
    trunk/blender/intern/raskter/raskter.c
    trunk/blender/source/blender/editors/mask/mask_add.c
    trunk/blender/source/blender/editors/mask/mask_draw.c
    trunk/blender/source/blender/editors/mask/mask_edit.c
    trunk/blender/source/blender/editors/mask/mask_ops.c
    trunk/blender/source/blender/editors/mask/mask_relationships.c
    trunk/blender/source/blender/editors/mask/mask_select.c
    trunk/blender/source/blender/editors/mask/mask_shapekey.c

Modified: trunk/blender/intern/raskter/raskter.c
===================================================================
--- trunk/blender/intern/raskter/raskter.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/intern/raskter/raskter.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -28,8 +28,7 @@
  *  \ingroup RASKTER
  */
 
-#include <stdio.h>
-#include <malloc.h>
+#include <stdlib.h>
 #include "raskter.h"
 
 /* from BLI_utildefines.h */

Modified: trunk/blender/source/blender/editors/mask/mask_add.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_add.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_add.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -31,12 +31,9 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_curve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
@@ -47,10 +44,7 @@
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_screen.h"
-#include "ED_mask.h"
-#include "ED_clip.h"
-#include "ED_keyframing.h"
+#include "ED_mask.h"  /* own include */
 
 #include "RNA_access.h"
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/editors/mask/mask_draw.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_draw.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_draw.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -32,7 +32,6 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_math.h"
 
 #include "BKE_context.h"
 #include "BKE_mask.h"
@@ -40,10 +39,8 @@
 #include "DNA_mask_types.h"
 #include "DNA_object_types.h"   /* SELECT */
 
-#include "ED_mask.h"
-
+#include "ED_mask.h"  /* own include */
 #include "BIF_gl.h"
-#include "BIF_glutil.h"
 
 #include "UI_resources.h"
 

Modified: trunk/blender/source/blender/editors/mask/mask_edit.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_edit.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_edit.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -29,9 +29,7 @@
  *  \ingroup edmask
  */
 
-#include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_math.h"
 
 #include "BKE_context.h"
@@ -41,7 +39,7 @@
 #include "WM_types.h"
 
 #include "ED_screen.h"
-#include "ED_mask.h"
+#include "ED_mask.h"  /* own include */
 #include "ED_object.h" /* ED_keymap_proportional_maskmode only */
 #include "ED_clip.h"
 #include "ED_transform.h"

Modified: trunk/blender/source/blender/editors/mask/mask_ops.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_ops.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_ops.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -31,12 +31,10 @@
 
 #include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_curve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 

Modified: trunk/blender/source/blender/editors/mask/mask_relationships.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_relationships.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_relationships.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -29,32 +29,23 @@
  *  \ingroup edmask
  */
 
-#include "MEM_guardedalloc.h"
 
-#include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 #include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_curve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 #include "BKE_tracking.h"
 
 #include "DNA_mask_types.h"
-#include "DNA_scene_types.h"
 #include "DNA_object_types.h"  /* SELECT */
 
 #include "WM_api.h"
 #include "WM_types.h"
 
 #include "ED_screen.h"
-#include "ED_mask.h"
-#include "ED_clip.h"
+#include "ED_mask.h"  /* own include */
 
-#include "RNA_access.h"
-#include "RNA_define.h"
-
 #include "mask_intern.h"  /* own include */
 
 static int mask_parent_clear_exec(bContext *C, wmOperator *UNUSED(op))

Modified: trunk/blender/source/blender/editors/mask/mask_select.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_select.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_select.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -32,14 +32,10 @@
 #include "MEM_guardedalloc.h"
 
 #include "BLI_utildefines.h"
-#include "BLI_listbase.h"
 #include "BLI_rect.h"
 #include "BLI_lasso.h"
-#include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_curve.h"
-#include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
 #include "DNA_mask_types.h"
@@ -49,8 +45,8 @@
 #include "WM_types.h"
 
 #include "ED_screen.h"
-#include "ED_mask.h"
 #include "ED_clip.h"
+#include "ED_mask.h"  /* own include */
 
 #include "RNA_access.h"
 #include "RNA_define.h"

Modified: trunk/blender/source/blender/editors/mask/mask_shapekey.c
===================================================================
--- trunk/blender/source/blender/editors/mask/mask_shapekey.c	2012-06-04 17:17:10 UTC (rev 47426)
+++ trunk/blender/source/blender/editors/mask/mask_shapekey.c	2012-06-04 17:27:22 UTC (rev 47427)
@@ -29,31 +29,20 @@
  *  \ingroup edmask
  */
 
-#include "MEM_guardedalloc.h"
-
 #include "BLI_utildefines.h"
-#include "BLI_listbase.h"
-#include "BLI_math.h"
 
 #include "BKE_context.h"
-#include "BKE_curve.h"
 #include "BKE_depsgraph.h"
 #include "BKE_mask.h"
 
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_object_types.h"  /* SELECT */
 
 #include "WM_api.h"
 #include "WM_types.h"
 
-#include "ED_screen.h"
-#include "ED_mask.h"
-#include "ED_clip.h"
+#include "ED_mask.h"  /* own include */
 
-#include "RNA_access.h"
-#include "RNA_define.h"
-
 #include "mask_intern.h"  /* own include */
 
 static int mask_shape_key_insert_exec(bContext *C, wmOperator *UNUSED(op))