Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/mask')
-rw-r--r--source/blender/editors/mask/mask_add.c4
-rw-r--r--source/blender/editors/mask/mask_draw.c8
-rw-r--r--source/blender/editors/mask/mask_edit.c8
-rw-r--r--source/blender/editors/mask/mask_editaction.c8
-rw-r--r--source/blender/editors/mask/mask_ops.c2
-rw-r--r--source/blender/editors/mask/mask_relationships.c2
-rw-r--r--source/blender/editors/mask/mask_select.c6
-rw-r--r--source/blender/editors/mask/mask_shapekey.c4
8 files changed, 21 insertions, 21 deletions
diff --git a/source/blender/editors/mask/mask_add.c b/source/blender/editors/mask/mask_add.c
index 6299d6761e0..80716195121 100644
--- a/source/blender/editors/mask/mask_add.c
+++ b/source/blender/editors/mask/mask_add.c
@@ -31,16 +31,16 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
+#include "DNA_mask_types.h"
#include "DNA_scene_types.h"
#include "DNA_screen_types.h"
-#include "DNA_mask_types.h"
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_select_utils.h"
#include "ED_mask.h" /* own include */
#include "ED_screen.h"
+#include "ED_select_utils.h"
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/mask/mask_draw.c b/source/blender/editors/mask/mask_draw.c
index 3f3bf8b7510..a532ff9e1f0 100644
--- a/source/blender/editors/mask/mask_draw.c
+++ b/source/blender/editors/mask/mask_draw.c
@@ -23,17 +23,17 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
+#include "BLI_listbase.h"
#include "BLI_math.h"
#include "BLI_rect.h"
-#include "BLI_listbase.h"
+#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "BKE_mask.h"
#include "DNA_mask_types.h"
-#include "DNA_screen_types.h"
#include "DNA_object_types.h" /* SELECT */
+#include "DNA_screen_types.h"
#include "DNA_space_types.h"
#include "ED_clip.h"
@@ -44,8 +44,8 @@
#include "BIF_glutil.h"
#include "GPU_immediate.h"
-#include "GPU_shader.h"
#include "GPU_matrix.h"
+#include "GPU_shader.h"
#include "GPU_state.h"
#include "UI_interface.h"
diff --git a/source/blender/editors/mask/mask_edit.c b/source/blender/editors/mask/mask_edit.c
index 88cc5e33617..1606d079462 100644
--- a/source/blender/editors/mask/mask_edit.c
+++ b/source/blender/editors/mask/mask_edit.c
@@ -32,12 +32,12 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_screen.h"
-#include "ED_select_utils.h"
-#include "ED_mask.h" /* own include */
+#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_clip.h"
+#include "ED_screen.h"
+#include "ED_select_utils.h"
#include "ED_sequencer.h"
#include "ED_transform.h"
diff --git a/source/blender/editors/mask/mask_editaction.c b/source/blender/editors/mask/mask_editaction.c
index 33f4bab14ec..31fc403b157 100644
--- a/source/blender/editors/mask/mask_editaction.c
+++ b/source/blender/editors/mask/mask_editaction.c
@@ -21,11 +21,11 @@
* \ingroup edmask
*/
+#include <math.h>
+#include <stddef.h>
#include <stdio.h>
-#include <string.h>
#include <stdlib.h>
-#include <stddef.h>
-#include <math.h>
+#include <string.h>
#include "MEM_guardedalloc.h"
@@ -40,8 +40,8 @@
#include "ED_anim_api.h"
#include "ED_keyframes_edit.h"
-#include "ED_mask.h" /* own include */
#include "ED_markers.h"
+#include "ED_mask.h" /* own include */
/* ***************************************** */
/* NOTE ABOUT THIS FILE:
diff --git a/source/blender/editors/mask/mask_ops.c b/source/blender/editors/mask/mask_ops.c
index 4d3283e608b..5e7d94dd567 100644
--- a/source/blender/editors/mask/mask_ops.c
+++ b/source/blender/editors/mask/mask_ops.c
@@ -33,9 +33,9 @@
#include "DEG_depsgraph.h"
#include "DEG_depsgraph_query.h"
-#include "DNA_scene_types.h"
#include "DNA_mask_types.h"
#include "DNA_object_types.h" /* SELECT */
+#include "DNA_scene_types.h"
#include "WM_api.h"
#include "WM_types.h"
diff --git a/source/blender/editors/mask/mask_relationships.c b/source/blender/editors/mask/mask_relationships.c
index 130ebb61a90..49eb4fbd4ca 100644
--- a/source/blender/editors/mask/mask_relationships.c
+++ b/source/blender/editors/mask/mask_relationships.c
@@ -35,8 +35,8 @@
#include "WM_api.h"
#include "WM_types.h"
-#include "ED_screen.h"
#include "ED_clip.h" /* frame remapping functions */
+#include "ED_screen.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 15b3ab047ee..53ef398ccd6 100644
--- a/source/blender/editors/mask/mask_select.c
+++ b/source/blender/editors/mask/mask_select.c
@@ -23,10 +23,10 @@
#include "MEM_guardedalloc.h"
-#include "BLI_utildefines.h"
-#include "BLI_rect.h"
#include "BLI_lasso_2d.h"
#include "BLI_math.h"
+#include "BLI_rect.h"
+#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "BKE_mask.h"
@@ -37,9 +37,9 @@
#include "WM_types.h"
#include "ED_clip.h"
+#include "ED_mask.h" /* own include */
#include "ED_screen.h"
#include "ED_select_utils.h"
-#include "ED_mask.h" /* own include */
#include "RNA_access.h"
#include "RNA_define.h"
diff --git a/source/blender/editors/mask/mask_shapekey.c b/source/blender/editors/mask/mask_shapekey.c
index 2300289fd3b..25b602d63c3 100644
--- a/source/blender/editors/mask/mask_shapekey.c
+++ b/source/blender/editors/mask/mask_shapekey.c
@@ -23,15 +23,15 @@
#include <stdlib.h>
-#include "BLI_utildefines.h"
#include "BLI_listbase.h"
#include "BLI_math.h"
+#include "BLI_utildefines.h"
#include "BKE_context.h"
#include "BKE_mask.h"
-#include "DNA_object_types.h"
#include "DNA_mask_types.h"
+#include "DNA_object_types.h"
#include "DNA_scene_types.h"
#include "DEG_depsgraph.h"