[Bf-blender-cvs] [9c02682f23b] hair_guides_grooming: Merge branch 'hair_guides' into hair_guides_grooming

[Lukas Tönne]

Commit: 9c02682f23b2b97112ea8c319566c3cbd0eb2337
Author: Lukas Tönne
Date:   Thu Jun 21 18:57:33 2018 +0100
Branches: hair_guides_grooming
https://developer.blender.org/rB9c02682f23b2b97112ea8c319566c3cbd0eb2337

Merge branch 'hair_guides' into hair_guides_grooming

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index ae82084bc76,0dbbf3ab927..e01538de7b2
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -59,13 -57,10 +57,13 @@@ class VIEW3D_HT_header(Header)
  
          if obj:
              # Set above:
-             # mode = obj.mode
+             # object_mode = obj.mode
  
              # Particle edit
-             if mode == 'EDIT' and obj.type == 'GROOM':
 -            if object_mode == 'PARTICLE_EDIT':
++            if object_mode == 'EDIT' and obj.type == 'GROOM':
 +                row = layout.row()
 +                row.prop(toolsettings.groom_edit_settings, "mode", text="", expand=True)
-             elif mode == 'PARTICLE_EDIT':
++            elif object_mode == 'PARTICLE_EDIT':
                  row = layout.row()
                  row.prop(tool_settings.particle_edit, "select_mode", text="", expand=True)