[Bf-blender-cvs] [e1ee4dff8d6] master: Cleanup: redundant mask includes

Campbell Barton noreply at git.blender.org
Fri Mar 27 01:49:05 CET 2020


Commit: e1ee4dff8d6548ca5c8f5b30be772be333de5e34
Author: Campbell Barton
Date:   Fri Mar 27 11:47:04 2020 +1100
Branches: master
https://developer.blender.org/rBe1ee4dff8d6548ca5c8f5b30be772be333de5e34

Cleanup: redundant mask includes

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

M	source/blender/blenkernel/intern/mask.c
M	source/blender/editors/mask/mask_add.c
M	source/blender/editors/mask/mask_draw.c
M	source/blender/editors/mask/mask_edit.c
M	source/blender/editors/mask/mask_ops.c
M	source/blender/editors/mask/mask_query.c
M	source/blender/editors/mask/mask_select.c

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

diff --git a/source/blender/blenkernel/intern/mask.c b/source/blender/blenkernel/intern/mask.c
index eb274fc1ef3..6c835dc5fb2 100644
--- a/source/blender/blenkernel/intern/mask.c
+++ b/source/blender/blenkernel/intern/mask.c
@@ -38,10 +38,6 @@
 #include "BLT_translation.h"
 
 #include "DNA_mask_types.h"
-#include "DNA_node_types.h"
-#include "DNA_screen_types.h"
-#include "DNA_sequence_types.h"
-#include "DNA_space_types.h"
 
 #include "BKE_animsys.h"
 #include "BKE_curve.h"
@@ -52,8 +48,6 @@
 #include "BKE_main.h"
 #include "BKE_mask.h"
 #include "BKE_movieclip.h"
-#include "BKE_node.h"
-#include "BKE_sequencer.h"
 #include "BKE_tracking.h"
 
 #include "DEG_depsgraph_build.h"
diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c
index 5d461ffdb20..9945383211a 100644
--- a/source/blender/editors/mask/mask_add.c
+++ b/source/blender/editors/mask/mask_add.c
@@ -29,7 +29,6 @@
 #include "BKE_mask.h"
 
 #include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
 
 #include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index a532ff9e1f0..2fda383ebb7 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -54,8 +54,6 @@
 
 #include "DEG_depsgraph_query.h"
 
-#include "mask_intern.h" /* own include */
-
 static void mask_spline_color_get(MaskLayer *mask_layer,
                                   MaskSpline *spline,
                                   const bool is_sel,
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index e18c4992671..e696cc37bd3 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -21,12 +21,9 @@
  * \ingroup edmask
  */
 
-#include "BLI_math.h"
-
 #include "BKE_context.h"
 #include "BKE_mask.h"
 
-#include "DNA_mask_types.h"
 #include "DNA_scene_types.h"
 
 #include "WM_api.h"
@@ -34,14 +31,8 @@
 
 #include "ED_clip.h"
 #include "ED_image.h"
-#include "ED_mask.h"   /* own include */
-#include "ED_object.h" /* ED_keymap_proportional_maskmode only */
-#include "ED_screen.h"
-#include "ED_select_utils.h"
+#include "ED_mask.h" /* own include */
 #include "ED_sequencer.h"
-#include "ED_transform.h"
-
-#include "UI_view2d.h"
 
 #include "RNA_access.h"
 
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 758d0abbab7..c4e3763dd94 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -31,7 +31,6 @@
 #include "BKE_mask.h"
 
 #include "DEG_depsgraph.h"
-#include "DEG_depsgraph_query.h"
 
 #include "DNA_mask_types.h"
 #include "DNA_object_types.h" /* SELECT */
diff --git a/source/blender/editors/mask/mask_query.c b/source/blender/editors/mask/mask_query.c
index 4459607191f..8caf5f2ed7b 100644
--- a/source/blender/editors/mask/mask_query.c
+++ b/source/blender/editors/mask/mask_query.c
@@ -35,20 +35,12 @@
 #include "DNA_scene_types.h"
 #include "DNA_screen_types.h"
 
-#include "WM_api.h"
-#include "WM_types.h"
-
 #include "ED_clip.h"
 #include "ED_image.h"
 #include "ED_mask.h" /* own include */
-#include "ED_screen.h"
-#include "ED_select_utils.h"
 
 #include "UI_view2d.h"
 
-#include "RNA_access.h"
-#include "RNA_define.h"
-
 #include "mask_intern.h" /* own include */
 
 /* -------------------------------------------------------------------- */
diff --git a/source/blender/editors/mask/mask_select.c b/source/blender/editors/mask/mask_select.c
index 53ef398ccd6..b21d20b360a 100644
--- a/source/blender/editors/mask/mask_select.c
+++ b/source/blender/editors/mask/mask_select.c
@@ -38,7 +38,6 @@
 
 #include "ED_clip.h"
 #include "ED_mask.h" /* own include */
-#include "ED_screen.h"
 #include "ED_select_utils.h"
 
 #include "RNA_access.h"



More information about the Bf-blender-cvs mailing list