[Bf-blender-cvs] [8ec7429a70c] blender2.8: Merge branch 'master' into blender2.8
Campbell Barton
noreply at git.blender.org
Mon Dec 17 07:32:59 CET 2018
Commit: 8ec7429a70cca85dd3bc7f29f1ac5030aec7054f
Author: Campbell Barton
Date: Mon Dec 17 17:26:47 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB8ec7429a70cca85dd3bc7f29f1ac5030aec7054f
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc release/scripts/startup/bl_ui/properties_grease_pencil_common.py
index 0f098bcc129,099de6e5e42..8ba0ac6303c
--- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
+++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py
@@@ -25,15 -25,15 +25,15 @@@ from bpy.app.translations import pgette
def gpencil_stroke_placement_settings(context, layout):
if context.space_data.type == 'VIEW_3D':
- propname = "gpencil_stroke_placement_view3d"
+ propname = "annotation_stroke_placement_view3d"
elif context.space_data.type == 'SEQUENCE_EDITOR':
- propname = "gpencil_stroke_placement_sequencer_preview"
+ propname = "annotation_stroke_placement_sequencer_preview"
elif context.space_data.type == 'IMAGE_EDITOR':
- propname = "gpencil_stroke_placement_image_editor"
+ propname = "annotation_stroke_placement_image_editor"
else:
- propname = "gpencil_stroke_placement_view2d"
+ propname = "annotation_stroke_placement_view2d"
- ts = context.tool_settings
+ tool_settings = context.tool_settings
col = layout.column(align=True)
diff --cc release/scripts/startup/bl_ui/space_clip.py
index 1ef4cf64680,d4a3f924238..8da033b3a3f
--- a/release/scripts/startup/bl_ui/space_clip.py
+++ b/release/scripts/startup/bl_ui/space_clip.py
@@@ -249,18 -140,11 +249,18 @@@ class CLIP_HT_header(Header)
layout.prop(sc, "pivot_point", text="", icon_only=True)
row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_edit_mask", text="", icon_only=True)
- row.prop(tool_settings, "use_proportional_edit_mask",
- text="", icon_only=True)
- if tool_settings.use_proportional_edit_mask:
- row.prop(tool_settings, "proportional_edit_falloff",
- text="", icon_only=True)
++ row.prop(tool_settings, "use_proportional_edit_mask", text="", icon_only=True)
+ sub = row.row(align=True)
- sub.active = toolsettings.use_proportional_edit_mask
- sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
++ sub.active = tool_settings.use_proportional_edit_mask
++ sub.prop(tool_settings, "proportional_edit_falloff", text="", icon_only=True)
+
+ row = layout.row()
+ row.template_ID(sc, "mask", new="mask.new")
+ row.popover(panel='CLIP_PT_mask_display')
+ row = layout.row(align=True)
+ icon = 'LOCKED' if sc.lock_selection else 'UNLOCKED'
+ row.prop(sc, "lock_selection", icon=icon, text="")
+ row.popover(panel='CLIP_PT_display')
def draw(self, context):
layout = self.layout
diff --cc release/scripts/startup/bl_ui/space_dopesheet.py
index b57a0b69539,4683b108e37..f35dea67854
--- a/release/scripts/startup/bl_ui/space_dopesheet.py
+++ b/release/scripts/startup/bl_ui/space_dopesheet.py
@@@ -211,36 -119,11 +211,36 @@@ class DOPESHEET_HT_header(Header)
row = layout.row(align=True)
row.template_header()
- DOPESHEET_MT_editor_menus.draw_collapsible(context, layout)
+ if st.mode == 'TIMELINE':
+ from .space_time import (
+ TIME_MT_editor_menus,
+ TIME_HT_editor_buttons,
+ )
+ TIME_MT_editor_menus.draw_collapsible(context, layout)
+ TIME_HT_editor_buttons.draw_header(context, layout)
+ else:
+ layout.prop(st, "ui_mode", text="")
+
+ DOPESHEET_MT_editor_menus.draw_collapsible(context, layout)
+ DOPESHEET_HT_editor_buttons.draw_header(context, layout)
- layout.prop(st, "mode", text="")
+
+# Header for "normal" dopesheet editor modes (e.g. Dope Sheet, Action, Shape Keys, etc.)
+class DOPESHEET_HT_editor_buttons(Header):
+ bl_idname = "DOPESHEET_HT_editor_buttons"
+ bl_space_type = 'DOPESHEET_EDITOR'
+ bl_label = ""
+
+ def draw(self, context):
+ pass
+
+ @staticmethod
+ def draw_header(context, layout):
+ st = context.space_data
- toolsettings = context.tool_settings
++ tool_settings = context.tool_settings
if st.mode in {'ACTION', 'SHAPEKEY'}:
+ # TODO: These buttons need some tidying up - Probably by using a popover, and bypassing the template_id() here
row = layout.row(align=True)
row.operator("action.layer_prev", text="", icon='TRIA_DOWN')
row.operator("action.layer_next", text="", icon='TRIA_UP')
@@@ -284,10 -169,10 +284,10 @@@
layout.prop(st, "auto_snap", text="")
row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_action", text="", icon_only=True)
- row.operator("action.copy", text="", icon='COPYDOWN')
- row.operator("action.paste", text="", icon='PASTEDOWN')
- if st.mode not in ('GPENCIL', 'MASK'):
- row.operator("action.paste", text="", icon='PASTEFLIPDOWN').flipped = True
++ row.prop(tool_settings, "use_proportional_action", text="", icon_only=True)
+ sub = row.row(align=True)
- sub.active = toolsettings.use_proportional_action
- sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
++ sub.active = tool_settings.use_proportional_action
++ sub.prop(tool_settings, "proportional_edit_falloff", text="", icon_only=True)
class DOPESHEET_MT_editor_menus(Menu):
diff --cc release/scripts/startup/bl_ui/space_graph.py
index ea418f37d47,7a920435b18..ee3f5de0f09
--- a/release/scripts/startup/bl_ui/space_graph.py
+++ b/release/scripts/startup/bl_ui/space_graph.py
@@@ -30,8 -26,10 +30,8 @@@ class GRAPH_HT_header(Header)
bl_space_type = 'GRAPH_EDITOR'
def draw(self, context):
- from .space_dopesheet import dopesheet_filter
-
layout = self.layout
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
st = context.space_data
@@@ -59,37 -70,6 +59,37 @@@
else:
row.operator("graph.ghost_curves_create", text="", icon='GHOST_ENABLED')
+ layout.popover(
+ panel="GRAPH_PT_filters",
+ text="",
+ icon='FILTER',
+ )
+
+ layout.prop(st, "auto_snap", text="")
+
+ row = layout.row(align=True)
- row.prop(toolsettings, "use_proportional_fcurve", text="", icon_only=True)
++ row.prop(tool_settings, "use_proportional_fcurve", text="", icon_only=True)
+ sub = row.row(align=True)
- sub.active = toolsettings.use_proportional_fcurve
- sub.prop(toolsettings, "proportional_edit_falloff", text="", icon_only=True)
++ sub.active = tool_settings.use_proportional_fcurve
++ sub.prop(tool_settings, "proportional_edit_falloff", text="", icon_only=True)
+
+ layout.prop(st, "pivot_point", icon_only=True)
+
+
+class GRAPH_PT_filters(DopesheetFilterPopoverBase, Panel):
+ bl_space_type = 'GRAPH_EDITOR'
+ bl_region_type = 'HEADER'
+ bl_label = "Filters"
+
+ def draw(self, context):
+ layout = self.layout
+
+ DopesheetFilterPopoverBase.draw_generic_filters(context, layout)
+ layout.separator()
+ DopesheetFilterPopoverBase.draw_search_filters(context, layout)
+ layout.separator()
+ DopesheetFilterPopoverBase.draw_standard_filters(context, layout)
+
class GRAPH_MT_editor_menus(Menu):
bl_idname = "GRAPH_MT_editor_menus"
diff --cc release/scripts/startup/bl_ui/space_image.py
index aafe4f91fe8,eb903f25f79..986423a1c58
--- a/release/scripts/startup/bl_ui/space_image.py
+++ b/release/scripts/startup/bl_ui/space_image.py
@@@ -49,8 -49,20 +49,8 @@@ class BrushButtonsPanel(UnifiedPaintPan
@classmethod
def poll(cls, context):
- toolsettings = context.tool_settings.image_paint
- return toolsettings.brush
- sima = context.space_data
+ tool_settings = context.tool_settings.image_paint
- return sima.show_paint and tool_settings.brush
-
-
-class UVToolsPanel:
- bl_space_type = 'IMAGE_EDITOR'
- bl_region_type = 'TOOLS'
- bl_category = "Tools"
-
- @classmethod
- def poll(cls, context):
- sima = context.space_data
- return sima.show_uvedit and not context.tool_settings.use_uv_sculpt
++ return tool_settings.brush
class IMAGE_MT_view(Menu):
@@@ -74,13 -86,13 +74,13 @@@
layout.prop(sima, "use_realtime_update")
if show_uvedit:
- layout.prop(toolsettings, "show_uv_local_view")
+ layout.prop(tool_settings, "show_uv_local_view")
- layout.prop(uv, "show_other_objects")
layout.prop(uv, "show_metadata")
+
if paint.brush and (context.image_paint_object or sima.mode == 'PAINT'):
layout.prop(uv, "show_texpaint")
- layout.prop(toolsettings, "show_uv_local_view", text="Show Same Material")
+ layout.prop(tool_settings, "show_uv_local_view", text="Show Same Material")
layout.separator()
@@@ -403,11 -393,11 +403,11 @@@ class IMAGE_MT_uvs_select_mode(Menu)
layout = self.layout
layout.operator_context = 'INVOKE_REGION_WIN'
- toolsettings = context.tool_settings
+ tool_settings = context.tool_settings
- # do smart things depending on whether uv_select_sync is on
+ # Do smart things depending on whether uv_select_sync is on.
- if toolsettings.use_uv_select_sync:
+ if tool_settings.use_uv_select_sync:
props = layout.operator("wm.context_set_value", text="Vertex", icon='VERTEXSEL')
props.value = "(True, False, False)"
props.data_path = "tool_settings.mesh_select_mode"
@@@ -514,7 -437,8 +514,7 @@@ class IMAGE_HT_header(Header)
sima = context.space_data
ima = sima.image
iuser = sima.image_user
- toolsettings = context.tool_settings
+ tool_settings = context.tool_
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list