Commit: ad5196b075fc4a93661a55042716f5ae36b70ca4
Author: Antonio Vazquez
Date: Fri Jun 8 09:55:29 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rBad5196b075fc4a93661a55042716f5ae36b70ca4
Merge branch 'blender2.8' into greasepencil-object
Conflicts:
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/object/object_ops.c
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index f726c08e833,a401328df68..42267350635
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -4059,9 -4031,12 +4081,11 @@@ classes =
VIEW3D_MT_edit_armature_delete,
VIEW3D_MT_edit_gpencil_transform,
VIEW3D_MT_edit_gpencil_interpolate,
+ VIEW3D_PIE_object_mode,
+ VIEW3D_PIE_view,
- VIEW3D_PT_grease_pencil,
- VIEW3D_PT_grease_pencil_palettecolor,
VIEW3D_PT_view3d_properties,
VIEW3D_PT_view3d_cursor,
+ VIEW3D_PT_gp_paper,
VIEW3D_PT_quad_view,
VIEW3D_PT_view3d_stereo,
VIEW3D_PT_shading,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
