Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 13:02:38 +0000 (15:02 +0200)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 21 Jun 2018 13:02:38 +0000 (15:02 +0200)
1  2 
intern/cycles/device/device_cuda.cpp
release/scripts/startup/bl_ui/space_userpref.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_userdef_types.h
source/blender/makesrna/intern/rna_userdef.c

Simple merge
index 804da7ede78fa2b3e2cf708ce9f3f8a84f81f8f2,c8f113f558d93568544cfe3d5048fa19436db414..2aaeba653fb78a26e2abc5a27ac500f82ca4a160
@@@ -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)
  
index b857660cad6d1ec59412624dba155fc44d5e6c67,c5a74122b3bbd930967cb9396f47ded4c09d1cd7..d6e6eb31dc38ae1236dabb5d0f7a4737139ff3cc
@@@ -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");