[Bf-blender-cvs] [029ac8dc15b] hair_guides: Merge branch 'blender2.8' into hair_guides
Lukas Tönne
noreply at git.blender.org
Tue May 15 08:45:43 CEST 2018
Commit: 029ac8dc15b247808cbd6f65dfdbb941628361b9
Author: Lukas Tönne
Date: Tue May 15 07:20:55 2018 +0100
Branches: hair_guides
https://developer.blender.org/rB029ac8dc15b247808cbd6f65dfdbb941628361b9
Merge branch 'blender2.8' into hair_guides
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 3143089040c,b7ab57d0f46..dbf01257273
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -65,9 -77,8 +77,11 @@@ class VIEW3D_HT_header(Header)
# mode = obj.mode
# Particle edit
- if mode == 'PARTICLE_EDIT':
+ if mode == 'EDIT' and obj.type == 'GROOM':
++ row = layout.row()
+ row.prop(toolsettings.groom_edit_settings, "mode", text="", expand=True)
+ elif mode == 'PARTICLE_EDIT':
+ row = layout.row()
row.prop(toolsettings.particle_edit, "select_mode", text="", expand=True)
# Occlude geometry
More information about the Bf-blender-cvs
mailing list