[Bf-blender-cvs] [c054a1a8486] blender2.8: Merge branch 'master' into blender2.8

[Campbell Barton]

Commit: c054a1a84867e652cd737cdab7ca790b6e038303
Author: Campbell Barton
Date:   Thu Jun 21 15:02:38 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc054a1a84867e652cd737cdab7ca790b6e038303

Merge branch 'master' into blender2.8

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



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

diff --cc release/scripts/startup/bl_ui/space_view3d.py
index 804da7ede78,c8f113f558d..2aaeba653fb
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@@ -3838,45 -3654,59 +3838,46 @@@ class VIEW3D_PT_overlay_edit_mesh(Panel
          layout = self.layout
  
          view = context.space_data
 +        shading = view.shading
 +        overlay = view.overlay
 +        tool_settings = context.tool_settings
 +        display_all = overlay.show_overlays
 +        data = context.active_object.data
 +        statvis = tool_settings.statvis
 +        with_freestyle = bpy.app.build_options.freestyle
++        show_developer_ui = context.user_preferences.view.show_developer_ui
  
          col = layout.column()
 -        col.active = view.show_reconstruction
 -        col.prop(view, "show_camera_path", text="Camera Path")
 -        col.prop(view, "show_bundle_names", text="3D Marker Names")
 -        col.label(text="Track Type and Size:")
 -        row = col.row(align=True)
 -        row.prop(view, "tracks_draw_type", text="")
 -        row.prop(view, "tracks_draw_size", text="")
 -
 -
 -class VIEW3D_PT_view3d_meshdisplay(Panel):
 -    bl_space_type = 'VIEW_3D'
 -    bl_region_type = 'UI'
 -    bl_label = "Mesh Display"
 +        col.active = display_all
  
 -    @classmethod
 -    def poll(cls, context):
 -        # The active object check is needed because of local-mode
 -        return (context.active_object and (context.mode == 'EDIT_MESH'))
 +        split = col.split()
  
 -    def draw(self, context):
 -        layout = self.layout
 -        with_freestyle = bpy.app.build_options.freestyle
 +        sub = split.column()
 +        sub.prop(data, "show_faces", text="Faces")
 +        sub.prop(data, "show_edges", text="Edges")
 +        sub.prop(data, "show_edge_crease", text="Creases")
 +        sub.prop(data, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural)
 +        sub.prop(data, "show_edge_bevel_weight", text="Bevel")
 +        if not with_freestyle:
 +            sub.prop(data, "show_edge_seams", text="Seams")
  
 -        mesh = context.active_object.data
 -        scene = context.scene
 +        sub = split.column()
 +        sub.prop(overlay, "show_occlude_wire")
 +        sub.prop(data, "show_extra_edge_length", text="Edge Length")
 +        sub.prop(data, "show_extra_edge_angle", text="Edge Angle")
 +        sub.prop(data, "show_extra_face_area", text="Face Area")
 +        sub.prop(data, "show_extra_face_angle", text="Face Angle")
  
-         if bpy.app.debug:
 -        split = layout.split()
++        if show_developer_ui:
 +            sub.prop(data, "show_extra_indices", text="Indices")
  
 -        col = split.column()
 -        col.label(text="Overlays:")
 -        col.prop(mesh, "show_faces", text="Faces")
 -        col.prop(mesh, "show_edges", text="Edges")
 -        col.prop(mesh, "show_edge_crease", text="Creases")
          if with_freestyle:
 -            col.prop(mesh, "show_edge_seams", text="Seams")
 -
 -        layout.prop(mesh, "show_weight")
 -
 -        col = split.column()
 -        col.label()
 -        if not with_freestyle:
 -            col.prop(mesh, "show_edge_seams", text="Seams")
 -        col.prop(mesh, "show_edge_sharp", text="Sharp", text_ctxt=i18n_contexts.plural)
 -        col.prop(mesh, "show_edge_bevel_weight", text="Bevel")
 -        if with_freestyle:
 -            col.prop(mesh, "show_freestyle_edge_marks", text="Edge Marks")
 -            col.prop(mesh, "show_freestyle_face_marks", text="Face Marks")
 -
 -        col = layout.column()
 +            col.label(text="Freestyle:")
 +            row = col.row()
 +            row.prop(data, "show_freestyle_edge_marks", text="Edge Marks")
 +            row.prop(data, "show_freestyle_face_marks", text="Face Marks")
 +            row.prop(data, "show_edge_seams", text="Seams")
  
 -        col.separator()
          col.label(text="Normals:")
          row = col.row(align=True)
  
diff --cc source/blender/makesrna/intern/rna_userdef.c
index b857660cad6,c5a74122b3b..d6e6eb31dc3
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@@ -3489,9 -3371,15 +3489,15 @@@ static void rna_def_userdef_view(Blende
  	RNA_def_property_ui_text(prop, "Tooltips", "Display tooltips (when off hold Alt to force display)");
  
  	prop = RNA_def_property(srna, "show_tooltips_python", PROP_BOOLEAN, PROP_NONE);
 -	RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", USER_TOOLTIPS_PYTHON);
 +	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_TOOLTIPS_PYTHON);
  	RNA_def_property_ui_text(prop, "Python Tooltips", "Show Python references in tooltips");
  
+ 	prop = RNA_def_property(srna, "show_developer_ui", PROP_BOOLEAN, PROP_NONE);
+ 	RNA_def_property_boolean_sdna(prop, NULL, "flag", USER_DEVELOPER_UI);
+ 	RNA_def_property_ui_text(
+ 	        prop, "Developer Extras",
+ 	        "Show options for developers (edit source in context menu, geometry indices)");
+ 
  	prop = RNA_def_property(srna, "show_object_info", PROP_BOOLEAN, PROP_NONE);
  	RNA_def_property_boolean_sdna(prop, NULL, "uiflag", USER_DRAWVIEWINFO);
  	RNA_def_property_ui_text(prop, "Display Object Info", "Display objects name and frame number in 3D view");