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:
authorJeroen Bakker <jeroen@blender.org>2020-03-06 14:08:03 +0300
committerJeroen Bakker <jeroen@blender.org>2020-03-06 14:11:55 +0300
commit297261eb906c56c7decf4401e6a3e06cec1691e8 (patch)
treef9833fb55af46edc0bc3849cffeb2dee83a3c6c9 /source/blender/blenkernel
parent9fa29fe7652a9adc4a11ba3dc2975595489f7bcd (diff)
CodeCleanup: Added enums to opengl render functions
Motivation the functions get 3 different kind of flag parameters (ImBuf, DrawType, OffscreenRendering) the naming of the flags were not clear, leading to mistakes and unnecessary time spend debugging.
Diffstat (limited to 'source/blender/blenkernel')
-rw-r--r--source/blender/blenkernel/BKE_sequencer.h15
-rw-r--r--source/blender/blenkernel/BKE_sequencer_offscreen.h56
-rw-r--r--source/blender/blenkernel/intern/sequencer.c1
3 files changed, 57 insertions, 15 deletions
diff --git a/source/blender/blenkernel/BKE_sequencer.h b/source/blender/blenkernel/BKE_sequencer.h
index 789d6b694cb..2a45d89bad4 100644
--- a/source/blender/blenkernel/BKE_sequencer.h
+++ b/source/blender/blenkernel/BKE_sequencer.h
@@ -521,21 +521,6 @@ struct Sequence *BKE_sequencer_add_movie_strip(struct bContext *C,
ListBase *seqbasep,
struct SeqLoadInfo *seq_load);
-typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph,
- struct Scene *scene,
- struct View3DShading *shading_override,
- int drawtype,
- struct Object *camera,
- int width,
- int height,
- unsigned int flag,
- unsigned int draw_flags,
- int alpha_mode,
- const char *viewname,
- struct GPUOffScreen *ofs,
- char err_out[256]);
-extern SequencerDrawView sequencer_view3d_cb;
-
/* copy/paste */
extern ListBase seqbase_clipboard;
extern int seqbase_clipboard_frame;
diff --git a/source/blender/blenkernel/BKE_sequencer_offscreen.h b/source/blender/blenkernel/BKE_sequencer_offscreen.h
new file mode 100644
index 00000000000..72e3f246dcb
--- /dev/null
+++ b/source/blender/blenkernel/BKE_sequencer_offscreen.h
@@ -0,0 +1,56 @@
+/*
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * The Original Code is Copyright (C) 2004 Blender Foundation.
+ * All rights reserved.
+ */
+
+#ifndef __BKE_SEQUENCER_OFFSCREEN_H__
+#define __BKE_SEQUENCER_OFFSCREEN_H__
+
+/** \file
+ * \ingroup bke
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "DNA_object_enums.h"
+
+#include "DNA_view3d_types.h"
+
+#include "IMB_imbuf_types.h"
+
+typedef struct ImBuf *(*SequencerDrawView)(struct Depsgraph *depsgraph,
+ struct Scene *scene,
+ struct View3DShading *shading_override,
+ eObjectDrawType drawtype,
+ struct Object *camera,
+ int width,
+ int height,
+ eImBufFlags flag,
+ eV3DOffscreenDrawFlag draw_flags,
+ int alpha_mode,
+ const char *viewname,
+ struct GPUOffScreen *ofs,
+ char err_out[256]);
+extern SequencerDrawView sequencer_view3d_cb;
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __BKE_SEQUENCER_H__ */
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index e86563ea08c..ea53726a94d 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -64,6 +64,7 @@
#include "BKE_layer.h"
#include "BKE_main.h"
#include "BKE_sequencer.h"
+#include "BKE_sequencer_offscreen.h"
#include "BKE_movieclip.h"
#include "BKE_fcurve.h"
#include "BKE_scene.h"