[Bf-blender-cvs] [06337279c75] greasepencil-object: GPencil: More basis structure changes
Antonio Vazquez
noreply at git.blender.org
Sat Jul 25 16:33:27 CEST 2020
Commit: 06337279c752213680fce7269d67cd4009c5968b
Author: Antonio Vazquez
Date: Thu Jul 23 17:27:54 2020 +0200
Branches: greasepencil-object
https://developer.blender.org/rB06337279c752213680fce7269d67cd4009c5968b
GPencil: More basis structure changes
===================================================================
M source/blender/editors/io/CMakeLists.txt
M source/blender/editors/io/io_gpencil.c
M source/blender/io/gpencil/gpencil_io_exporter.h
M source/blender/io/gpencil/intern/gpencil_io_capi.cc
===================================================================
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index a50aa40ea86..5a0ada2dfd8 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -24,6 +24,7 @@ set(INC
../../depsgraph
../../io/alembic
../../io/collada
+ ../../io/gpencil
../../io/usd
../../makesdna
../../makesrna
@@ -81,6 +82,6 @@ if(WITH_INTERNATIONAL)
add_definitions(-DWITH_INTERNATIONAL)
endif()
-list(APPEND LIB bf_gpencil)
+list(APPEND LIB bf_gpencil)
blender_add_lib(bf_editor_io "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --git a/source/blender/editors/io/io_gpencil.c b/source/blender/editors/io/io_gpencil.c
index 3e308aab4d1..7d2fcfd7561 100644
--- a/source/blender/editors/io/io_gpencil.c
+++ b/source/blender/editors/io/io_gpencil.c
@@ -66,6 +66,8 @@
#include "io_gpencil.h"
+#include "gpencil_io_exporter.h"
+
static int wm_gpencil_export_invoke(bContext *C, wmOperator *op, const wmEvent *event)
{
UNUSED_VARS(event);
@@ -98,7 +100,6 @@ static int wm_gpencil_export_invoke(bContext *C, wmOperator *op, const wmEvent *
static int wm_gpencil_export_exec(bContext *C, wmOperator *op)
{
-#if 0
if (!RNA_struct_property_is_set(op->ptr, "filepath")) {
BKE_report(op->reports, RPT_ERROR, "No filename given");
@@ -113,6 +114,7 @@ static int wm_gpencil_export_exec(bContext *C, wmOperator *op)
.frame_end = RNA_int_get(op->ptr, "end"),
};
+#if 0
/* Take some defaults from the scene, if not specified explicitly. */
Scene *scene = CTX_data_scene(C);
if (params.frame_start == INT_MIN) {
diff --git a/source/blender/io/gpencil/gpencil_io_exporter.h b/source/blender/io/gpencil/gpencil_io_exporter.h
index 7cc17d28182..d7c680bca1b 100644
--- a/source/blender/io/gpencil/gpencil_io_exporter.h
+++ b/source/blender/io/gpencil/gpencil_io_exporter.h
@@ -16,13 +16,17 @@
#pragma once
/** \file
- * \ingroup bgpencil_io
+ * \ingroup bgpencil
*/
#ifdef __cplusplus
extern "C" {
#endif
+struct GpencilExportParams {
+ double frame_start;
+ double frame_end;
+};
#ifdef __cplusplus
}
diff --git a/source/blender/io/gpencil/intern/gpencil_io_capi.cc b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
index c41c1dc9b7e..b2b2f1af12c 100644
--- a/source/blender/io/gpencil/intern/gpencil_io_capi.cc
+++ b/source/blender/io/gpencil/intern/gpencil_io_capi.cc
@@ -15,7 +15,7 @@
*/
/** \file
- * \ingroup bgpencil_io
+ * \ingroup bgpencil
*/
#include "../gpencil_io_exporter.h"
More information about the Bf-blender-cvs
mailing list