Commit: e002ad1748b4aee6328940eb3f3cf928bce5c8c2
Author: Antonio Vazquez
Date: Wed Mar 24 16:06:17 2021 +0100
Branches: greasepencil-object
https://developer.blender.org/rBe002ad1748b4aee6328940eb3f3cf928bce5c8c2
Merge branch 'master' into greasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_topbar.py
source/blender/blenkernel/BKE_gpencil_geom.h
source/blender/blenkernel/intern/gpencil_geom.c
source/blender/editors/gpencil/gpencil_utils.c
source/blender/editors/include/ED_gpencil.h
source/blender/editors/io/CMakeLists.txt
source/blender/editors/io/io_gpencil.h
source/blender/editors/io/io_gpencil_export.c
source/blender/editors/io/io_gpencil_import.c
source/blender/editors/io/io_gpencil_utils.c
source/blender/editors/io/io_ops.c
source/blender/io/CMakeLists.txt
source/blender/io/gpencil/CMakeLists.txt
source/blender/io/gpencil/gpencil_io.h
source/blender/io/gpencil/intern/gpencil_io_base.cc
source/blender/io/gpencil/intern/gpencil_io_base.h
source/blender/io/gpencil/intern/gpencil_io_capi.cc
source/blender/io/gpencil/intern/gpencil_io_export_base.h
source/blender/io/gpencil/intern/gpencil_io_export_pdf.cc
source/blender/io/gpencil/intern/gpencil_io_export_pdf.h
source/blender/io/gpencil/intern/gpencil_io_export_svg.cc
source/blender/io/gpencil/intern/gpencil_io_export_svg.h
source/blender/io/gpencil/intern/gpencil_io_import_base.cc
source/blender/io/gpencil/intern/gpencil_io_import_base.h
source/blender/io/gpencil/intern/gpencil_io_import_svg.cc
source/blender/io/gpencil/intern/gpencil_io_import_svg.h
source/blender/io/gpencil/nanosvg/nanosvg.h
===================================================================
===================================================================
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
