Commit: 98d562af5265109500fbc9ec4600311e2143322e
Author: Jeroen Bakker
Date: Fri Mar 6 12:31:38 2020 +0100
Branches: master
https://developer.blender.org/rB98d562af5265109500fbc9ec4600311e2143322e
CodeCleanup: move include statements before extern "C"
Mistake on recent changes that would fail when used in CPP.
===================================================================
M source/blender/blenkernel/BKE_sequencer_offscreen.h
M source/blender/editors/include/ED_view3d_offscreen.h
===================================================================
diff --git a/source/blender/blenkernel/BKE_sequencer_offscreen.h
b/source/blender/blenkernel/BKE_sequencer_offscreen.h
index 0385985b019..c753b4b566f 100644
--- a/source/blender/blenkernel/BKE_sequencer_offscreen.h
+++ b/source/blender/blenkernel/BKE_sequencer_offscreen.h
@@ -24,16 +24,16 @@
* \ingroup bke
*/
-#ifdef __cplusplus
-extern "C" {
-#endif
-
#include "DNA_object_enums.h"
#include "DNA_view3d_types.h"
#include "IMB_imbuf_types.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph,
struct Scene *scene,
struct View3DShading
*shading_override,
diff --git a/source/blender/editors/include/ED_view3d_offscreen.h
b/source/blender/editors/include/ED_view3d_offscreen.h
index 4c0d081bcd8..7d51a8c7ece 100644
--- a/source/blender/editors/include/ED_view3d_offscreen.h
+++ b/source/blender/editors/include/ED_view3d_offscreen.h
@@ -24,6 +24,11 @@
#ifndef __ED_VIEW3D_OFFSCREEN_H__
#define __ED_VIEW3D_OFFSCREEN_H__
+#include "DNA_view3d_types.h"
+#include "DNA_object_enums.h"
+
+#include "IMB_imbuf_types.h"
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -37,10 +42,6 @@ struct GPUOffScreen;
struct GPUViewport;
struct View3DShading;
-#include "DNA_view3d_types.h"
-#include "DNA_object_enums.h"
-#include "IMB_imbuf_types.h"
-
void ED_view3d_draw_offscreen(struct Depsgraph *depsgraph,
struct Scene *scene,
eDrawType drawtype,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
