[Bf-blender-cvs] [6af509f5a5e] soc-2020-io-performance: Merge branch 'master' into soc-2020-io-performance

[Howard Trickey]

Commit: 6af509f5a5eae8b5c16937b9ad77c4736e5a2735
Author: Howard Trickey
Date:   Fri Mar 26 08:56:24 2021 -0400
Branches: soc-2020-io-performance
https://developer.blender.org/rB6af509f5a5eae8b5c16937b9ad77c4736e5a2735

Merge branch 'master' into soc-2020-io-performance

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



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

diff --cc source/blender/editors/io/CMakeLists.txt
index 31a77a0adf6,44b5f85050f..f4da114159f
--- a/source/blender/editors/io/CMakeLists.txt
+++ b/source/blender/editors/io/CMakeLists.txt
@@@ -24,23 -24,25 +24,40 @@@ set(IN
    ../../depsgraph
    ../../io/alembic
    ../../io/collada
+   ../../io/gpencil
 +  ../../io/wavefront_obj
 +  ../../io/usd
 +  ../../makesdna
 +  ../../makesrna
 +  ../../windowmanager
 +  ../../../../intern/guardedalloc
 +)
 +
 +set(INC_SYS
 +
 +)
 +
++set(SRC
++  io_alembic.c
+   ../../io/usd
+   ../../makesdna
+   ../../makesrna
+   ../../windowmanager
+   ../../../../intern/guardedalloc
+ )
+ 
+ set(INC_SYS
+ 
+ )
+ 
  set(SRC
    io_alembic.c
    io_cache.c
    io_collada.c
+   io_gpencil_export.c
+   io_gpencil_import.c
+   io_gpencil_utils.c
 +  io_obj.c
    io_ops.c
    io_usd.c
  
diff --cc source/blender/editors/io/io_ops.c
index 53effe31eb2,9fa34a1c55d..eebb7432172
--- a/source/blender/editors/io/io_ops.c
+++ b/source/blender/editors/io/io_ops.c
@@@ -38,7 -38,7 +38,8 @@@
  #endif
  
  #include "io_cache.h"
+ #include "io_gpencil.h"
 +#include "io_obj.h"
  
  void ED_operatortypes_io(void)
  {
@@@ -55,8 -55,16 +56,18 @@@
    WM_operatortype_append(WM_OT_usd_export);
  #endif
  
+   WM_operatortype_append(WM_OT_gpencil_import_svg);
+ 
+ #ifdef WITH_PUGIXML
+   WM_operatortype_append(WM_OT_gpencil_export_svg);
+ #endif
+ 
+ #ifdef WITH_HARU
+   WM_operatortype_append(WM_OT_gpencil_export_pdf);
+ #endif
+ 
    WM_operatortype_append(CACHEFILE_OT_open);
    WM_operatortype_append(CACHEFILE_OT_reload);
 +  WM_operatortype_append(WM_OT_obj_import);
 +  WM_operatortype_append(WM_OT_obj_export);
  }