[Bf-blender-cvs] [f16c5954866] custom-manipulators: Missed in recent removal of face-maps

[Campbell Barton]

Commit: f16c5954866c831001875b5c8f45005618c77563
Author: Campbell Barton
Date:   Fri Jun 16 08:44:07 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rBf16c5954866c831001875b5c8f45005618c77563

Missed in recent removal of face-maps

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

M	release/scripts/startup/bl_ui/properties_data_bone.py
M	release/scripts/startup/bl_ui/properties_data_mesh.py
M	release/scripts/startup/bl_ui/properties_data_modifier.py
M	release/scripts/startup/bl_ui/properties_object.py
M	release/scripts/startup/bl_ui/space_sequencer.py

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

diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py
index 8b374e87028..e6a2a266e08 100644
--- a/release/scripts/startup/bl_ui/properties_data_bone.py
+++ b/release/scripts/startup/bl_ui/properties_data_bone.py
@@ -294,10 +294,6 @@ class BONE_PT_display(BoneButtonsPanel, Panel):
 
             col = split.column()
             col.prop(bone, "hide", text="Hide")
-            col.prop(bone, "show_fmap")
-            sub = col.column()
-            sub.active = bone.show_fmap
-            sub.prop(bone, "show_only_fmap")
             sub = col.column()
             sub.active = bool(pchan and pchan.custom_shape)
             sub.prop(bone, "show_wire", text="Wireframe")
diff --git a/release/scripts/startup/bl_ui/properties_data_mesh.py b/release/scripts/startup/bl_ui/properties_data_mesh.py
index 44023fb4679..4d00b70a0fa 100644
--- a/release/scripts/startup/bl_ui/properties_data_mesh.py
+++ b/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ -364,7 +364,7 @@ class DATA_PT_shape_keys(MeshButtonsPanel, Panel):
                     col.label(text="Blend:")
                     col.prop_search(kb, "vertex_group", ob, "vertex_groups", text="")
                     col.prop_search(kb, "relative_key", key, "key_blocks", text="")
-                    col.prop_search(kb, "face_map", ob, "face_maps", text="")
+
             else:
                 layout.prop(kb, "interpolation")
                 row = layout.column()
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py
index e8206b5d46d..05321ee4486 100644
--- a/release/scripts/startup/bl_ui/properties_data_modifier.py
+++ b/release/scripts/startup/bl_ui/properties_data_modifier.py
@@ -61,7 +61,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel):
         col.label(text="Bind To:")
         col.prop(md, "use_vertex_groups", text="Vertex Groups")
         col.prop(md, "use_bone_envelopes", text="Bone Envelopes")
-        col.prop(md, "use_face_maps", text="Face Maps")
 
         layout.separator()
 
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py
index f1ecce75a3b..5311e893773 100644
--- a/release/scripts/startup/bl_ui/properties_object.py
+++ b/release/scripts/startup/bl_ui/properties_object.py
@@ -125,18 +125,6 @@ class OBJECT_PT_transform_locks(ObjectButtonsPanel, Panel):
             sub.prop(ob, "lock_rotation_w", text="W")
 
 
-class OBJECT_PT_widgets(ObjectButtonsPanel, Panel):
-    bl_label = "Widgets"
-
-    def draw(self, context):
-        layout = self.layout
-
-        ob = context.object
-        wg = ob.wgroup
-
-        layout.operator_menu_enum("object.widget_add", "type")
-
-
 class OBJECT_PT_relations(ObjectButtonsPanel, Panel):
     bl_label = "Relations"
 
diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py
index 33e0e46cd27..79bb10cefeb 100644
--- a/release/scripts/startup/bl_ui/space_sequencer.py
+++ b/release/scripts/startup/bl_ui/space_sequencer.py
@@ -97,7 +97,7 @@ class SEQUENCER_HT_header(Header):
 
             layout.separator()
             layout.operator("sequencer.refresh_all")
-            layout.prop(st, "show_overdrop")
+            layout.prop(st, "show_backdrop")
         else:
             if st.view_type == 'SEQUENCER_PREVIEW':
                 layout.separator()
@@ -491,7 +491,7 @@ class SequencerButtonsPanel_Output:
     @staticmethod
     def has_preview(context):
         st = context.space_data
-        return (st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}) or st.show_overdrop
+        return (st.view_type in {'PREVIEW', 'SEQUENCER_PREVIEW'}) or st.show_backdrop
 
     @classmethod
     def poll(cls, context):