diff options
author | Dalai Felinto <dfelinto@gmail.com> | 2017-01-23 13:17:09 +0300 |
---|---|---|
committer | Dalai Felinto <dfelinto@gmail.com> | 2017-01-23 13:17:09 +0300 |
commit | 673a149e877ca820a1a2fa3a8211418cd71e33e0 (patch) | |
tree | 7a4b193b9a52cb18b4f7bba23e7f66506dff35f6 /release | |
parent | f8e4999656ad24396779d47e59f9ff9bc615fcf0 (diff) | |
parent | 181424152611aa7d842ece0265fb6c630c7a4d77 (diff) |
Merge remote-tracking branch 'origin/blender2.8' into render-layers
Diffstat (limited to 'release')
5 files changed, 78 insertions, 8 deletions
diff --git a/release/scripts/startup/bl_ui/properties_animviz.py b/release/scripts/startup/bl_ui/properties_animviz.py index 11081232f12..046b5eb2aa5 100644 --- a/release/scripts/startup/bl_ui/properties_animviz.py +++ b/release/scripts/startup/bl_ui/properties_animviz.py @@ -86,8 +86,12 @@ class MotionPathButtonsPanel: col = split.column() col.label(text="Show:") col.prop(mps, "show_frame_numbers", text="Frame Numbers") + if mpath is not None: + col.prop(mpath, "lines", text='Lines') + col.prop(mpath, "line_thickness", text='Thickness') col = split.column() + col.label('') col.prop(mps, "show_keyframe_highlight", text="Keyframes") sub = col.column() sub.enabled = mps.show_keyframe_highlight @@ -95,6 +99,14 @@ class MotionPathButtonsPanel: sub.prop(mps, "show_keyframe_action_all", text="+ Non-Grouped Keyframes") sub.prop(mps, "show_keyframe_numbers", text="Keyframe Numbers") + # Customize path + if mpath is not None: + row = layout.row(align=True) + row.prop(mpath, "use_custom_color", text='', toggle=True, icon='COLOR') + sub = row.row(align=True) + sub.enabled = mpath.use_custom_color + sub.prop(mpath, "color", text='') + # FIXME: this panel still needs to be ported so that it will work correctly with animviz class OnionSkinButtonsPanel: diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index 98b7a76e541..4d54817a21c 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -714,7 +714,7 @@ class WORLD_PT_game_physics(WorldButtonsPanel, Panel): class WORLD_PT_game_physics_obstacles(WorldButtonsPanel, Panel): - bl_label = "Obstacle simulation" + bl_label = "Obstacle Simulation" COMPAT_ENGINES = {'BLENDER_GAME'} @classmethod diff --git a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py index f8ee7c9a851..4529c127839 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -115,6 +115,12 @@ class GreasePencilDrawingToolsPanel: row.operator("gpencil.draw", icon='LINE_DATA', text="Line").mode = 'DRAW_STRAIGHT' row.operator("gpencil.draw", icon='MESH_DATA', text="Poly").mode = 'DRAW_POLY' + col.separator() + + sub = col.column(align=True) + sub.operator("gpencil.blank_frame_add", icon='NEW') + sub.operator("gpencil.active_frames_delete_all", icon='X', text="Delete Frame(s)") + sub = col.column(align=True) sub.prop(context.tool_settings, "use_gpencil_additive_drawing", text="Additive Drawing") sub.prop(context.tool_settings, "use_gpencil_continuous_drawing", text="Continuous Drawing") @@ -227,12 +233,7 @@ class GreasePencilStrokeEditPanel: if is_3d_view: layout.separator() - col = layout.column(align=True) - col.operator("gpencil.interpolate", text="Interpolate") - col.operator("gpencil.interpolate_sequence", text="Sequence") - settings = context.tool_settings.gpencil_sculpt - col.prop(settings, "interpolate_all_layers") - col.prop(settings, "interpolate_selected_only") + layout.separator() col = layout.column(align=True) @@ -247,7 +248,57 @@ class GreasePencilStrokeEditPanel: if is_3d_view: layout.separator() - layout.operator("gpencil.reproject") + layout.operator_menu_enum("gpencil.reproject", text="Reproject Strokes...", property="type") + + +class GreasePencilInterpolatePanel: + bl_space_type = 'VIEW_3D' + bl_label = "Interpolate" + bl_category = "Grease Pencil" + bl_region_type = 'TOOLS' + bl_options = {'DEFAULT_CLOSED'} + + @classmethod + def poll(cls, context): + if context.gpencil_data is None: + return False + elif context.space_data.type != 'VIEW_3D': + return False + + gpd = context.gpencil_data + return bool(context.editable_gpencil_strokes) and bool(gpd.use_stroke_edit_mode) + + @staticmethod + def draw(self, context): + layout = self.layout + settings = context.tool_settings.gpencil_interpolate + + col = layout.column(align=True) + col.operator("gpencil.interpolate", text="Interpolate") + col.operator("gpencil.interpolate_sequence", text="Sequence") + col.operator("gpencil.interpolate_reverse", text="Remove Breakdowns") + + col = layout.column(align=True) + col.label(text="Options:") + col.prop(settings, "interpolate_all_layers") + col.prop(settings, "interpolate_selected_only") + + col = layout.column(align=True) + col.label(text="Sequence Options:") + col.prop(settings, "type") + if settings.type == 'CUSTOM': + box = layout.box() + # TODO: Options for loading/saving curve presets? + box.template_curve_mapping(settings, "interpolation_curve", brush=True) + elif settings.type != 'LINEAR': + col.prop(settings, "easing") + + if settings.type == 'BACK': + layout.prop(settings, "back") + elif setting.type == 'ELASTIC': + sub = layout.column(align=True) + sub.prop(settings, "amplitude") + sub.prop(settings, "period") class GreasePencilBrushPanel: diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 3eb76a3b0f9..60e86d7544d 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -22,6 +22,7 @@ from bpy.types import Menu, Panel, UIList from bl_ui.properties_grease_pencil_common import ( GreasePencilDrawingToolsPanel, GreasePencilStrokeEditPanel, + GreasePencilInterpolatePanel, GreasePencilStrokeSculptPanel, GreasePencilBrushPanel, GreasePencilBrushCurvesPanel @@ -1963,6 +1964,11 @@ class VIEW3D_PT_tools_grease_pencil_edit(GreasePencilStrokeEditPanel, Panel): bl_space_type = 'VIEW_3D' +# Grease Pencil stroke interpolation tools +class VIEW3D_PT_tools_grease_pencil_interpolate(GreasePencilInterpolatePanel, Panel): + bl_space_type = 'VIEW_3D' + + # Grease Pencil stroke sculpting tools class VIEW3D_PT_tools_grease_pencil_sculpt(GreasePencilStrokeSculptPanel, Panel): bl_space_type = 'VIEW_3D' diff --git a/release/scripts/startup/nodeitems_builtins.py b/release/scripts/startup/nodeitems_builtins.py index 69358302782..e915aa5bb72 100644 --- a/release/scripts/startup/nodeitems_builtins.py +++ b/release/scripts/startup/nodeitems_builtins.py @@ -145,6 +145,7 @@ shader_node_categories = [ NodeItem("ShaderNodeMaterial"), NodeItem("ShaderNodeCameraData"), NodeItem("ShaderNodeFresnel"), + NodeItem("ShaderNodeLayerWeight"), NodeItem("ShaderNodeLampData"), NodeItem("ShaderNodeValue"), NodeItem("ShaderNodeRGB"), |