[Bf-blender-cvs] [6dc17536874] temp-gpencil-bezier-stroke-type: Merge branch 'master' into temp-gpencil-bezier-stroke-type

[Falk David]

Commit: 6dc175368741b75458ce574b36a814d6c18f79d2
Author: Falk David
Date:   Wed May 12 15:19:31 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB6dc175368741b75458ce574b36a814d6c18f79d2

Merge branch 'master' into temp-gpencil-bezier-stroke-type

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 91a838f8aa9,4b06a2df3a0..bbbde2b24b2
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -7645,9 -7689,11 +7689,12 @@@ classes = 
      VIEW3D_MT_weight_gpencil,
      VIEW3D_MT_gpencil_animation,
      VIEW3D_MT_gpencil_simplify,
-     VIEW3D_MT_gpencil_copy_layer,
+     VIEW3D_MT_gpencil_append_active_layer,
+     VIEW3D_MT_gpencil_append_all_layers,
+     VIEW3D_MT_gpencil_append_active_material,
+     VIEW3D_MT_gpencil_append_all_materials,
      VIEW3D_MT_gpencil_autoweights,
 +    VIEW3D_PT_gpencil_curve_fit,
      VIEW3D_MT_gpencil_edit_context_menu,
      VIEW3D_MT_edit_curve,
      VIEW3D_MT_edit_curve_ctrlpoints,
diff --cc source/blender/blenloader/intern/versioning_300.c
index 71fd75659a2,ae2371402e4..f40b416dc3a
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -21,7 -21,7 +21,8 @@@
  #define DNA_DEPRECATED_ALLOW
  
  #include "BLI_listbase.h"
 +#include "BLI_math.h"
+ #include "BLI_math_vector.h"
  #include "BLI_utildefines.h"
  
  #include "DNA_brush_types.h"