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
path: root/source
diff options
context:
space:
mode:
authorJeroen Bakker <jeroen@blender.org>2020-03-06 14:31:38 +0300
committerJeroen Bakker <jeroen@blender.org>2020-03-06 14:32:53 +0300
commit98d562af5265109500fbc9ec4600311e2143322e (patch)
treeaca0d930e017a59e666ef9eb3c3ee39910171800 /source
parent24a37b3c03f50411669ce26ab078de8980802ce3 (diff)
CodeCleanup: move include statements before extern "C"
Mistake on recent changes that would fail when used in CPP.
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/BKE_sequencer_offscreen.h8
-rw-r--r--source/blender/editors/include/ED_view3d_offscreen.h9
2 files changed, 9 insertions, 8 deletions
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,