[Bf-blender-cvs] [71df3bc00ca] hair_object: Fix merge error in view3d ui script.

[Lukas Toenne]

Commit: 71df3bc00cac10a61abdfd1d5e92b6daaf0f3ee3
Author: Lukas Toenne
Date:   Sun Oct 28 08:59:24 2018 +0000
Branches: hair_object
https://developer.blender.org/rB71df3bc00cac10a61abdfd1d5e92b6daaf0f3ee3

Fix merge error in view3d ui script.

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

M	release/scripts/startup/bl_ui/space_view3d.py

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

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 42dec9495b4..cb91b00eb90 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -1435,18 +1435,6 @@ class VIEW3D_MT_metaball_add(Menu):
 
 class TOPBAR_MT_edit_curve_add(Menu):
     bl_idname = "TOPBAR_MT_edit_curve_add"
-
-class VIEW3D_MT_hair_add(Menu):
-    bl_idname = "VIEW3D_MT_hair_add"
-    bl_label = "Hair"
-
-    def draw(self, context):
-        layout = self.layout
-
-        layout.operator_context = 'INVOKE_REGION_WIN'
-        layout.operator("object.hair_add")
-
-
     bl_label = "Add"
 
     def draw(self, context):
@@ -1461,6 +1449,17 @@ class VIEW3D_MT_hair_add(Menu):
             VIEW3D_MT_curve_add.draw(self, context)
 
 
+class VIEW3D_MT_hair_add(Menu):
+    bl_idname = "VIEW3D_MT_hair_add"
+    bl_label = "Hair"
+
+    def draw(self, context):
+        layout = self.layout
+
+        layout.operator_context = 'INVOKE_REGION_WIN'
+        layout.operator("object.hair_add")
+
+
 class TOPBAR_MT_edit_armature_add(Menu):
     bl_idname = "TOPBAR_MT_edit_armature_add"
     bl_label = "Armature"