Commit: 70264903a4593bd690e2f1001cb018b94b91cf80 Author: Antonio Vazquez Date: Tue Jan 7 11:35:30 2020 +0100 Branches: greasepencil-object https://developer.blender.org/rB70264903a4593bd690e2f1001cb018b94b91cf80
Merge branch 'master' into greasepencil-object Conflicts: release/scripts/startup/bl_ui/space_toolsystem_toolbar.py =================================================================== =================================================================== diff --cc release/scripts/startup/bl_ui/space_toolsystem_toolbar.py index d09f30affdc,170b635f7e1..6cf664591d6 --- a/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py +++ b/release/scripts/startup/bl_ui/space_toolsystem_toolbar.py @@@ -2172,7 -2132,7 +2174,9 @@@ class VIEW3D_PT_tools_active(ToolSelect _defs_gpencil_edit.tosphere, ), None, + _defs_gpencil_edit.transform_fill, ++ None, + *_tools_annotate, ], 'SCULPT_GPENCIL': [ _defs_gpencil_sculpt.generate_from_brushes, @@@ -2185,16 -2146,9 +2190,18 @@@ ], 'WEIGHT_GPENCIL': [ _defs_gpencil_weight.generate_from_brushes, + None, + *_tools_annotate, ], + 'VERTEX_GPENCIL': [ + _defs_gpencil_vertex.generate_from_brushes, + None, + lambda context: ( + VIEW3D_PT_tools_active._tools_gpencil_select + if _defs_gpencil_vertex.poll_select_mask(context) + else () + ), + ], } _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs