[Bf-blender-cvs] [222deeee3d9] greasepencil-object: SVG: functions moved to editors/io for ease of external access.

[YimingWu]

Commit: 222deeee3d9a68434f6c7e389b7e8e698d639850
Author: YimingWu
Date:   Wed Jul 10 20:10:33 2019 +0800
Branches: greasepencil-object
https://developer.blender.org/rB222deeee3d9a68434f6c7e389b7e8e698d639850

SVG: functions moved to editors/io for ease of external access.

===================================================================

M	source/blender/blenkernel/CMakeLists.txt
M	source/blender/editors/gpencil/gpencil_svg.c
A	source/blender/editors/include/ED_svg.h
M	source/blender/editors/io/CMakeLists.txt
R097	source/blender/blenkernel/intern/writesvg.c	source/blender/editors/io/io_svg.c
R082	source/blender/blenkernel/BKE_writesvg.h	source/blender/editors/io/io_svg.h

===================================================================

diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt
index f0373016e95..e564e91749c 100644
--- a/source/blender/blenkernel/CMakeLists.txt
+++ b/source/blender/blenkernel/CMakeLists.txt
@@ -221,7 +221,6 @@ set(SRC
   intern/workspace.c
   intern/world.c
   intern/writeavi.c
-  intern/writesvg.c
 
   BKE_DerivedMesh.h
   BKE_action.h
@@ -344,7 +343,6 @@ set(SRC
   BKE_workspace.h
   BKE_world.h
   BKE_writeavi.h
-  BKE_writesvg.h
 
   nla_private.h
   particle_private.h
diff --git a/source/blender/editors/gpencil/gpencil_svg.c b/source/blender/editors/gpencil/gpencil_svg.c
index a739dfb8925..494f38df299 100644
--- a/source/blender/editors/gpencil/gpencil_svg.c
+++ b/source/blender/editors/gpencil/gpencil_svg.c
@@ -41,7 +41,6 @@
 #include "BKE_context.h"
 #include "BKE_gpencil.h"
 #include "BKE_report.h"
-#include "BKE_writesvg.h"
 
 #include "UI_interface.h"
 
@@ -50,7 +49,7 @@
 
 #include "ED_gpencil.h"
 #include "ED_select_utils.h"
-
+#include "ED_svg.h"
 
 static int gpencil_export_svg_exec(bContext *C, wmOperator *op)
 {
@@ -60,11 +59,9 @@ static int gpencil_export_svg_exec(bContext *C, wmOperator *op)
 
   for(gpl = gpd->layers.first; gpl; gpl = gpl->next){
     Text *ta = BKE_text_add(CTX_data_main(C),"exported_svg");
-    BKE_svg_data_from_gpencil(gpd,ta,gpl,CTX_data_scene(C)->r.cfra);
+    ED_svg_data_from_gpencil(gpd,ta,gpl,CTX_data_scene(C)->r.cfra);
   }
 
-  
-
   return OPERATOR_FINISHED;
 }
 
diff --git a/source/blender/blenkernel/BKE_writesvg.h b/source/blender/editors/include/ED_svg.h
similarity index 75%
copy from source/blender/blenkernel/BKE_writesvg.h
copy to source/blender/editors/include/ED_svg.h
index a597abb8d03..554133e3b50 100644
--- a/source/blender/blenkernel/BKE_writesvg.h
+++ b/source/blender/editors/include/ED_svg.h
@@ -13,18 +13,18 @@
  * 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) 2001-2002 by NaN Holding BV.
+ * The Original Code is Copyright (C) 2009 Blender Foundation.
  * All rights reserved.
  */
 
-#ifndef __BKE_WRITESVG_H__
-#define __BKE_WRITESVG_H__
-
 /** \file
- * \ingroup bke
+ * \ingroup editors
  */
 
-bool BKE_svg_data_from_gpencil(struct bGPdata* gpd, struct Text* ta, struct bGPDlayer* layer, int frame);
+#ifndef __ED_SVG_H__
+#define __ED_SVG_H__
+
 
+bool ED_svg_data_from_gpencil(struct bGPdata* gpd, struct Text* ta, struct bGPDlayer* layer, int frame);
 
-#endif
+#endif /* __ED_SVG_H__ */
diff --git a/source/blender/editors/io/CMakeLists.txt b/source/blender/editors/io/CMakeLists.txt
index 5a35b251d0c..6797a029267 100644
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@ -39,11 +39,13 @@ set(SRC
   io_cache.c
   io_collada.c
   io_ops.c
+  io_svg.c
 
   io_alembic.h
   io_cache.h
   io_collada.h
   io_ops.h
+  io_svg.h
 )
 
 set(LIB
diff --git a/source/blender/blenkernel/intern/writesvg.c b/source/blender/editors/io/io_svg.c
similarity index 97%
rename from source/blender/blenkernel/intern/writesvg.c
rename to source/blender/editors/io/io_svg.c
index 86ab34051fe..9774fa792e1 100644
--- a/source/blender/blenkernel/intern/writesvg.c
+++ b/source/blender/editors/io/io_svg.c
@@ -15,7 +15,7 @@
  */
 
 /** \file
- * \ingroup bke
+ * \ingroup editor/io
  */
 
 #include <stdlib.h>
@@ -134,7 +134,7 @@ static int svg_gpencil_get_node_callback(GPencilSVGIterator* iterator, float* x,
     return 1;
 }
 
-bool BKE_svg_data_from_gpencil(bGPdata* gpd, Text* ta, bGPDlayer* layer, int frame){
+bool ED_svg_data_from_gpencil(bGPdata* gpd, Text* ta, bGPDlayer* layer, int frame){
     if(!gpd || !ta || !gpd->layers.first){
         return false;
     }
diff --git a/source/blender/blenkernel/BKE_writesvg.h b/source/blender/editors/io/io_svg.h
similarity index 82%
rename from source/blender/blenkernel/BKE_writesvg.h
rename to source/blender/editors/io/io_svg.h
index a597abb8d03..6f6fd925f86 100644
--- a/source/blender/blenkernel/BKE_writesvg.h
+++ b/source/blender/editors/io/io_svg.h
@@ -17,14 +17,14 @@
  * All rights reserved.
  */
 
-#ifndef __BKE_WRITESVG_H__
-#define __BKE_WRITESVG_H__
+#ifndef __IO_SVG_H__
+#define __IO_SVG_H__
 
 /** \file
- * \ingroup bke
+ * \ingroup editor/io
  */
 
-bool BKE_svg_data_from_gpencil(struct bGPdata* gpd, struct Text* ta, struct bGPDlayer* layer, int frame);
+bool ED_svg_data_from_gpencil(struct bGPdata* gpd, struct Text* ta, struct bGPDlayer* layer, int frame);
 
 
 #endif