[Bf-blender-cvs] [88c5c92b036] soc-2019-npr: Merge branch 'greasepencil-object' into soc-2019-npr

[YimingWu]

Commit: 88c5c92b0364afd267f7017f8b6da89a7cdc7d8f
Author: YimingWu
Date:   Wed Jul 10 20:14:44 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rB88c5c92b0364afd267f7017f8b6da89a7cdc7d8f

Merge branch 'greasepencil-object' into soc-2019-npr

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



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

diff --cc source/blender/editors/io/io_svg.h
index 807775f65f8,6f6fd925f86..16fbb8b8970
--- a/source/blender/editors/io/io_svg.h
+++ b/source/blender/editors/io/io_svg.h
@@@ -17,15 -17,14 +17,16 @@@
   * 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 BKE_svg_data_from_lanpr_chain(Text* ta, struct LANPR_RenderBuffer* rb, struct LANPR_LineLayer* ll);
++
++bool ED_svg_data_from_lanpr_chain(Text* ta, struct LANPR_RenderBuffer* rb, struct LANPR_LineLayer* ll);
+ bool ED_svg_data_from_gpencil(struct bGPdata* gpd, struct Text* ta, struct bGPDlayer* layer, int frame);
  
  
  #endif