Commit: b5d2473730d4a2de38a9ff1e71637d5123ebca58 Author: Bastien Montagne Date: Mon Nov 28 12:27:22 2016 +0100 Branches: soc-2016-pbvh-painting https://developer.blender.org/rBb5d2473730d4a2de38a9ff1e71637d5123ebca58
Cleanup: remove include of ED_view3d.h from paint_intern.h Really always better to avoid includes in includes, unless totally impossible/unreasonable to do otherwise... =================================================================== M source/blender/editors/sculpt_paint/paint_image_2d.c M source/blender/editors/sculpt_paint/paint_intern.h M source/blender/editors/sculpt_paint/paint_ops.c M source/blender/editors/sculpt_paint/paint_undo.c M source/blender/editors/sculpt_paint/sculpt.c M source/blender/editors/sculpt_paint/sculpt_undo.c M source/blender/editors/sculpt_paint/sculpt_uv.c =================================================================== diff --git a/source/blender/editors/sculpt_paint/paint_image_2d.c b/source/blender/editors/sculpt_paint/paint_image_2d.c index 4f93c12..03f1e47 100644 --- a/source/blender/editors/sculpt_paint/paint_image_2d.c +++ b/source/blender/editors/sculpt_paint/paint_image_2d.c @@ -54,6 +54,7 @@ #include "ED_paint.h" #include "ED_screen.h" +#include "ED_view3d.h" /* For paint_intern.h */ #include "IMB_imbuf.h" #include "IMB_imbuf_types.h" diff --git a/source/blender/editors/sculpt_paint/paint_intern.h b/source/blender/editors/sculpt_paint/paint_intern.h index 00f7fb4..2f29c99 100644 --- a/source/blender/editors/sculpt_paint/paint_intern.h +++ b/source/blender/editors/sculpt_paint/paint_intern.h @@ -27,8 +27,6 @@ /** \file blender/editors/sculpt_paint/paint_intern.h * \ingroup edsculpt */ -#include "ED_view3d.h" - #ifndef __PAINT_INTERN_H__ #define __PAINT_INTERN_H__ diff --git a/source/blender/editors/sculpt_paint/paint_ops.c b/source/blender/editors/sculpt_paint/paint_ops.c index ace1804..7d9dfd4 100644 --- a/source/blender/editors/sculpt_paint/paint_ops.c +++ b/source/blender/editors/sculpt_paint/paint_ops.c @@ -43,6 +43,8 @@ #include "ED_paint.h" #include "ED_screen.h" #include "ED_image.h" +#include "ED_view3d.h" /* For paint_intern.h */ + #include "UI_resources.h" #include "WM_api.h" diff --git a/source/blender/editors/sculpt_paint/paint_undo.c b/source/blender/editors/sculpt_paint/paint_undo.c index 27d3f66..b29ed48 100644 --- a/source/blender/editors/sculpt_paint/paint_undo.c +++ b/source/blender/editors/sculpt_paint/paint_undo.c @@ -39,6 +39,7 @@ #include "BKE_global.h" #include "ED_paint.h" +#include "ED_view3d.h" /* For paint_intern.h */ #include "paint_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt.c b/source/blender/editors/sculpt_paint/sculpt.c index 5a2d9d3..9fad461 100644 --- a/source/blender/editors/sculpt_paint/sculpt.c +++ b/source/blender/editors/sculpt_paint/sculpt.c @@ -74,6 +74,8 @@ #include "ED_sculpt.h" #include "ED_object.h" #include "ED_screen.h" +#include "ED_view3d.h" /* For paint_intern.h */ + #include "paint_intern.h" #include "sculpt_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_undo.c b/source/blender/editors/sculpt_paint/sculpt_undo.c index 2a8af93..be27b3d 100644 --- a/source/blender/editors/sculpt_paint/sculpt_undo.c +++ b/source/blender/editors/sculpt_paint/sculpt_undo.c @@ -63,6 +63,7 @@ #include "GPU_buffers.h" #include "ED_paint.h" +#include "ED_view3d.h" /* For paint_intern.h */ #include "bmesh.h" #include "paint_intern.h" diff --git a/source/blender/editors/sculpt_paint/sculpt_uv.c b/source/blender/editors/sculpt_paint/sculpt_uv.c index fd2a0b1..854e717 100644 --- a/source/blender/editors/sculpt_paint/sculpt_uv.c +++ b/source/blender/editors/sculpt_paint/sculpt_uv.c @@ -54,6 +54,7 @@ #include "ED_screen.h" #include "ED_image.h" #include "ED_mesh.h" +#include "ED_view3d.h" /* For paint_intern.h */ #include "WM_api.h" #include "WM_types.h" _______________________________________________ Bf-blender-cvs mailing list [email protected] https://lists.blender.org/mailman/listinfo/bf-blender-cvs
