diff options
Diffstat (limited to 'release/scripts/startup/bl_ui')
19 files changed, 93 insertions, 33 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_armature.py b/release/scripts/startup/bl_ui/properties_data_armature.py index 84e06d4c7fc..3c9e2eb8f8b 100644 --- a/release/scripts/startup/bl_ui/properties_data_armature.py +++ b/release/scripts/startup/bl_ui/properties_data_armature.py @@ -186,7 +186,6 @@ class DATA_PT_pose_library(ArmatureButtonsPanel, Panel): # column of operators for active pose # - goes beside list col = row.column(align=True) - col.active = (poselib.library is None) # invoke should still be used for 'add', as it is needed to allow # add/replace options to be used properly diff --git a/release/scripts/startup/bl_ui/properties_data_bone.py b/release/scripts/startup/bl_ui/properties_data_bone.py index a14e34580c5..2c7f18b3dfe 100644 --- a/release/scripts/startup/bl_ui/properties_data_bone.py +++ b/release/scripts/startup/bl_ui/properties_data_bone.py @@ -229,6 +229,8 @@ class BONE_PT_display(BoneButtonsPanel, Panel): col.label(text="Custom Shape:") col.prop(pchan, "custom_shape", text="") if pchan.custom_shape: + col.prop(pchan, "use_custom_shape_bone_size", text="Bone Size") + col.prop(pchan, "custom_shape_scale", text="Scale") col.prop_search(pchan, "custom_shape_transform", ob.pose, "bones", text="At") diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index eb8ffa1fb60..f83dea996e6 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -286,7 +286,7 @@ class DATA_PT_active_spline(CurveButtonsPanelActive, Panel): sub.prop(act_spline, "order_v", text="V") sub.prop(act_spline, "resolution_v", text="V") - if not is_surf: + if act_spline.type == 'BEZIER': col = layout.column() col.label(text="Interpolation:") diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 549c75d6fda..de8617ecc52 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -874,6 +874,8 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.label(text="Options:") col.prop(md, "use_subsurf_uv") col.prop(md, "show_only_control_edges") + if hasattr(md, "use_opensubdiv"): + col.prop(md, "use_opensubdiv") def SURFACE(self, layout, ob, md): layout.label(text="Settings are inside the Physics tab") diff --git a/release/scripts/startup/bl_ui/properties_freestyle.py b/release/scripts/startup/bl_ui/properties_freestyle.py index f58a698d194..e0620447185 100644 --- a/release/scripts/startup/bl_ui/properties_freestyle.py +++ b/release/scripts/startup/bl_ui/properties_freestyle.py @@ -381,7 +381,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) - def draw_alpha_modifier(self, context, modifier): layout = self.layout @@ -496,7 +495,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, row.prop(modifier, "angle_min") row.prop(modifier, "angle_max") - elif modifier.type == 'CURVATURE_3D': self.draw_modifier_curve_common(box, modifier, False, False) row = box.row(align=True) @@ -510,7 +508,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, message = "Enable Face Smoothness to use this modifier" self.draw_modifier_box_error(col.box(), modifier, message) - def draw_geometry_modifier(self, context, modifier): layout = self.layout @@ -611,7 +608,6 @@ class RENDERLAYER_PT_freestyle_linestyle(RenderLayerFreestyleEditorButtonsPanel, elif modifier.type == 'SIMPLIFICATION': box.prop(modifier, "tolerance") - def draw(self, context): layout = self.layout diff --git a/release/scripts/startup/bl_ui/properties_game.py b/release/scripts/startup/bl_ui/properties_game.py index fa57bf2115f..ed1253ea3bf 100644 --- a/release/scripts/startup/bl_ui/properties_game.py +++ b/release/scripts/startup/bl_ui/properties_game.py @@ -55,6 +55,7 @@ class PHYSICS_PT_game_physics(PhysicsButtonsPanel, Panel): layout.prop(game, "step_height", slider=True) layout.prop(game, "jump_speed") layout.prop(game, "fall_speed") + layout.prop(game, "jump_max") elif physics_type in {'DYNAMIC', 'RIGID_BODY'}: split = layout.split() @@ -247,7 +248,7 @@ class PHYSICS_PT_game_obstacles(PhysicsButtonsPanel, Panel): game = context.object.game rd = context.scene.render return (rd.engine in cls.COMPAT_ENGINES) \ - and (game.physics_type in {'SENSOR', 'STATIC', 'DYNAMIC', 'RIGID_BODY', 'SOFT_BODY'}) + and (game.physics_type in {'SENSOR', 'STATIC', 'DYNAMIC', 'RIGID_BODY', 'SOFT_BODY', 'CHARACTER', 'NO_COLLISION'}) def draw_header(self, context): game = context.active_object.game 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 e86fc79e343..91a986d8e50 100644 --- a/release/scripts/startup/bl_ui/properties_grease_pencil_common.py +++ b/release/scripts/startup/bl_ui/properties_grease_pencil_common.py @@ -303,6 +303,8 @@ class GPENCIL_PIE_tools_more(Menu): pie.operator("wm.call_menu_pie", text="Back to Main Palette...").name = "GPENCIL_PIE_tool_palette" +############################### + class GPENCIL_UL_layer(UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): # assert(isinstance(item, bpy.types.GPencilLayer) @@ -354,7 +356,9 @@ class GreasePencilDataPanel: layout.template_ID(gpd_owner, "grease_pencil", new="gpencil.data_add", unlink="gpencil.data_unlink") # Grease Pencil data... - if gpd: + if (gpd is None) or (not gpd.layers): + layout.operator("gpencil.layer_add", text="New Layer") + else: self.draw_layers(context, layout, gpd) def draw_layers(self, context, layout, gpd): diff --git a/release/scripts/startup/bl_ui/properties_render.py b/release/scripts/startup/bl_ui/properties_render.py index 88b7e0802ce..1f1802aa373 100644 --- a/release/scripts/startup/bl_ui/properties_render.py +++ b/release/scripts/startup/bl_ui/properties_render.py @@ -459,8 +459,12 @@ class RENDER_PT_encoding(RenderButtonsPanel, Panel): split = layout.split() split.prop(rd.ffmpeg, "format") - if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG'}: + if ffmpeg.format in {'AVI', 'QUICKTIME', 'MKV', 'OGG', 'MPEG4'}: split.prop(ffmpeg, "codec") + if ffmpeg.codec == 'H264': + row = layout.row() + row.label() + row.prop(ffmpeg, "use_lossless_output") elif rd.ffmpeg.format == 'H264': split.prop(ffmpeg, "use_lossless_output") else: diff --git a/release/scripts/startup/bl_ui/properties_render_layer.py b/release/scripts/startup/bl_ui/properties_render_layer.py index 8a3e33f1936..9b8bc237db9 100644 --- a/release/scripts/startup/bl_ui/properties_render_layer.py +++ b/release/scripts/startup/bl_ui/properties_render_layer.py @@ -187,6 +187,7 @@ class RENDERLAYER_UL_renderviews(UIList): class RENDERLAYER_PT_views(RenderLayerButtonsPanel, Panel): bl_label = "Views" COMPAT_ENGINES = {'BLENDER_RENDER'} + bl_options = {'DEFAULT_CLOSED'} def draw_header(self, context): rd = context.scene.render diff --git a/release/scripts/startup/bl_ui/space_dopesheet.py b/release/scripts/startup/bl_ui/space_dopesheet.py index 7fd9719a6e3..34137c8e9d3 100644 --- a/release/scripts/startup/bl_ui/space_dopesheet.py +++ b/release/scripts/startup/bl_ui/space_dopesheet.py @@ -153,7 +153,8 @@ class DOPESHEET_HT_header(Header): row = layout.row(align=True) row.operator("action.copy", text="", icon='COPYDOWN') row.operator("action.paste", text="", icon='PASTEDOWN') - row.operator("action.paste", text="", icon='PASTEFLIPDOWN').flipped = True + if st.mode not in ('GPENCIL', 'MASK'): + row.operator("action.paste", text="", icon='PASTEFLIPDOWN').flipped = True class DOPESHEET_MT_editor_menus(Menu): @@ -338,7 +339,7 @@ class DOPESHEET_MT_key(Menu): layout.operator_menu_enum("action.interpolation_type", "type", text="Interpolation Mode") layout.separator() - layout.operator("action.clean") + layout.operator("action.clean").channels = False layout.operator("action.clean", text="Clean Channels").channels = True layout.operator("action.sample") @@ -421,7 +422,7 @@ class DOPESHEET_MT_delete(Menu): layout.separator() - layout.operator("action.clean") + layout.operator("action.clean").channels = False layout.operator("action.clean", text="Clean Channels").channels = True diff --git a/release/scripts/startup/bl_ui/space_filebrowser.py b/release/scripts/startup/bl_ui/space_filebrowser.py index 0d900a41f25..d7b93dc36f0 100644 --- a/release/scripts/startup/bl_ui/space_filebrowser.py +++ b/release/scripts/startup/bl_ui/space_filebrowser.py @@ -40,22 +40,23 @@ class FILEBROWSER_HT_header(Header): row.operator("file.parent", text="", icon='FILE_PARENT') row.operator("file.refresh", text="", icon='FILE_REFRESH') - row = layout.row() - row.separator() - - row = layout.row(align=True) + layout.separator() layout.operator_context = 'EXEC_DEFAULT' - row.operator("file.directory_new", icon='NEWFOLDER') + layout.operator("file.directory_new", icon='NEWFOLDER', text="") + layout.separator() layout.operator_context = 'INVOKE_DEFAULT' params = st.params # can be None when save/reload with a file selector open if params: + is_lib_browser = params.use_library_browsing + + layout.prop(params, "recursion_level", text="") + layout.prop(params, "display_type", expand=True, text="") - if params.display_type == 'FILE_IMGDISPLAY': - layout.prop(params, "thumbnail_size", text="") + layout.prop(params, "display_size", text="") layout.prop(params, "sort_method", expand=True, text="") @@ -68,8 +69,8 @@ class FILEBROWSER_HT_header(Header): row.prop(params, "use_filter_folder", text="") if params.filter_glob: - #if st.active_operator and hasattr(st.active_operator, "filter_glob"): - # row.prop(params, "filter_glob", text="") + # if st.active_operator and hasattr(st.active_operator, "filter_glob"): + # row.prop(params, "filter_glob", text="") row.label(params.filter_glob) else: row.prop(params, "use_filter_blender", text="") @@ -81,9 +82,17 @@ class FILEBROWSER_HT_header(Header): row.prop(params, "use_filter_sound", text="") row.prop(params, "use_filter_text", text="") + if is_lib_browser: + row.prop(params, "use_filter_blendid", text="") + if params.use_filter_blendid: + row.separator() + row.prop(params, "filter_id_category", text="") + row.separator() row.prop(params, "filter_search", text="", icon='VIEWZOOM') + layout.template_running_jobs() + class FILEBROWSER_UL_dir(bpy.types.UIList): def draw_item(self, context, layout, data, item, icon, active_data, active_propname, index): @@ -214,5 +223,29 @@ class FILEBROWSER_PT_recent_folders(Panel): col.operator("file.reset_recent", icon='X', text="") +class FILEBROWSER_PT_advanced_filter(Panel): + bl_space_type = 'FILE_BROWSER' + bl_region_type = 'TOOLS' + bl_category = "Filter" + bl_label = "Advanced Filter" + + @classmethod + def poll(cls, context): + # only useful in append/link (library) context currently... + return context.space_data.params.use_library_browsing + + def draw(self, context): + layout = self.layout + space = context.space_data + params = space.params + + if params and params.use_library_browsing: + layout.prop(params, "use_filter_blendid") + if params.use_filter_blendid: + layout.separator() + col = layout.column() + col.prop(params, "filter_id") + + if __name__ == "__main__": # only for live edit. bpy.utils.register_module(__name__) diff --git a/release/scripts/startup/bl_ui/space_graph.py b/release/scripts/startup/bl_ui/space_graph.py index 104fd14797e..82497f11bb1 100644 --- a/release/scripts/startup/bl_ui/space_graph.py +++ b/release/scripts/startup/bl_ui/space_graph.py @@ -257,7 +257,7 @@ class GRAPH_MT_key(Menu): layout.operator_menu_enum("graph.easing_type", "type", text="Easing Type") layout.separator() - layout.operator("graph.clean") + layout.operator("graph.clean").channels = False layout.operator("graph.clean", text="Clean Channels").channels = True layout.operator("graph.smooth") layout.operator("graph.sample") @@ -293,7 +293,7 @@ class GRAPH_MT_delete(Menu): layout.separator() - layout.operator("graph.clean") + layout.operator("graph.clean").channels = False layout.operator("graph.clean", text="Clean Channels").channels = True diff --git a/release/scripts/startup/bl_ui/space_image.py b/release/scripts/startup/bl_ui/space_image.py index b3fc643cc41..c3024b25282 100644 --- a/release/scripts/startup/bl_ui/space_image.py +++ b/release/scripts/startup/bl_ui/space_image.py @@ -705,7 +705,7 @@ class IMAGE_PT_tools_transform_uvs(Panel, UVToolsPanel): col.operator("transform.shear") -class IMAGE_PT_paint(Panel, BrushButtonsPanel): +class IMAGE_PT_paint(Panel, ImagePaintPanel): bl_label = "Paint" bl_category = "Tools" @@ -721,6 +721,11 @@ class IMAGE_PT_paint(Panel, BrushButtonsPanel): if brush: brush_texpaint_common(self, context, layout, brush, settings) + @classmethod + def poll(cls, context): + sima = context.space_data + toolsettings = context.tool_settings.image_paint + return sima.show_paint class IMAGE_PT_tools_brush_overlay(BrushButtonsPanel, Panel): bl_label = "Overlay" @@ -920,7 +925,7 @@ class IMAGE_PT_paint_curve(BrushButtonsPanel, Panel): row.operator("brush.curve_preset", icon='NOCURVE', text="").shape = 'MAX' -class VIEW3D_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel): +class IMAGE_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel): bl_category = "Tools" bl_context = "imagepaint" bl_label = "Tiling" @@ -936,7 +941,7 @@ class VIEW3D_PT_tools_imagepaint_symmetry(BrushButtonsPanel, Panel): row = col.row(align=True) row.prop(ipaint, "tile_x", text="X", toggle=True) row.prop(ipaint, "tile_y", text="Y", toggle=True) - + class IMAGE_PT_tools_brush_appearance(BrushButtonsPanel, Panel): bl_label = "Appearance" diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index 48a1b28289e..d295cc19fb7 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -203,6 +203,12 @@ class INFO_MT_file_previews(Menu): layout = self.layout layout.operator("wm.previews_ensure") + layout.operator("wm.previews_batch_generate") + + layout.separator() + + layout.operator("wm.previews_clear") + layout.operator("wm.previews_batch_clear") class INFO_MT_game(Menu): diff --git a/release/scripts/startup/bl_ui/space_sequencer.py b/release/scripts/startup/bl_ui/space_sequencer.py index a3066cb4ba8..58df86402a6 100644 --- a/release/scripts/startup/bl_ui/space_sequencer.py +++ b/release/scripts/startup/bl_ui/space_sequencer.py @@ -177,8 +177,10 @@ class SEQUENCER_MT_view(Menu): layout.separator() if is_sequencer_view: + layout.operator_context = 'INVOKE_REGION_WIN' layout.operator("sequencer.view_all", text="View all Sequences") layout.operator("sequencer.view_selected") + layout.operator_context = 'INVOKE_DEFAULT' if is_preview: layout.operator_context = 'INVOKE_REGION_PREVIEW' layout.operator("sequencer.view_all_preview", text="Fit preview in window") @@ -549,6 +551,7 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): if strip.input_count > 0: col = layout.column() + col.enabled = False col.prop(strip, "input_1") if strip.input_count > 1: col.prop(strip, "input_2") @@ -636,8 +639,10 @@ class SEQUENCER_PT_effect(SequencerButtonsPanel, Panel): col.prop(strip, "text") col.prop(strip, "font_size") col.prop(strip, "use_shadow") - col.prop(strip, "align") + col.prop(strip, "align_x") + col.prop(strip, "align_y") col.prop(strip, "location") + col.prop(strip, "wrap_width") layout.operator("sequencer.export_subtitles") col = layout.column(align=True) diff --git a/release/scripts/startup/bl_ui/space_time.py b/release/scripts/startup/bl_ui/space_time.py index c4c4097315c..817c28c6359 100644 --- a/release/scripts/startup/bl_ui/space_time.py +++ b/release/scripts/startup/bl_ui/space_time.py @@ -230,7 +230,7 @@ class TIME_MT_autokey(Menu): def marker_menu_generic(layout): - #layout.operator_context = 'EXEC_REGION_WIN' + # layout.operator_context = 'EXEC_REGION_WIN' layout.column() layout.operator("marker.add", "Add Marker") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 55a436b6967..e58fe1e0c33 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -493,7 +493,8 @@ class USERPREF_PT_system(Panel): col.separator() col.label(text="Sequencer / Clip Editor:") - col.prop(system, "prefetch_frames") + # currently disabled in the code + # col.prop(system, "prefetch_frames") col.prop(system, "memory_cache_limit") # 3. Column @@ -1190,7 +1191,7 @@ class USERPREF_MT_addons_dev_guides(Menu): def draw(self, context): layout = self.layout - layout.operator("wm.url_open", text="API Concepts", icon='URL').url = "http://wiki.blender.org/index.php/Dev:2.5/Py/API/Intro" + layout.operator("wm.url_open", text="API Concepts", icon='URL').url = bpy.types.WM_OT_doc_view._prefix + "/info_quickstart.html" layout.operator("wm.url_open", text="Addon Guidelines", icon='URL').url = "http://wiki.blender.org/index.php/Dev:2.5/Py/Scripts/Guidelines/Addons" layout.operator("wm.url_open", text="How to share your addon", icon='URL').url = "http://wiki.blender.org/index.php/Dev:Py/Sharing" diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index f5db15dae35..7cca831257a 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -1999,7 +1999,7 @@ class VIEW3D_MT_pose_group(Menu): layout.separator() - #layout.operator_context = 'INVOKE_AREA' + # layout.operator_context = 'INVOKE_AREA' layout.operator("pose.group_unassign") layout.operator("pose.group_remove") @@ -3293,7 +3293,7 @@ class VIEW3D_PT_background_image(Panel): box.template_image(bg, "image", bg.image_user, compact=True) has_bg = True - if use_multiview and bg.view_axis in {'CAMERA','ALL'}: + if use_multiview and bg.view_axis in {'CAMERA', 'ALL'}: box.prop(bg.image, "use_multiview") column = box.column() diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 2294e109f0c..a24dc494c30 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -1552,7 +1552,6 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel): row.prop(sculpt, "lock_y", text="Y", toggle=True) row.prop(sculpt, "lock_z", text="Z", toggle=True) - layout.label(text="Tiling:") row = layout.row(align=True) @@ -1562,6 +1561,7 @@ class VIEW3D_PT_sculpt_symmetry(Panel, View3DPaintPanel): layout.column().prop(sculpt, "tile_offset", text="Tile Offset") + class VIEW3D_PT_tools_brush_appearance(Panel, View3DPaintPanel): bl_category = "Options" bl_label = "Appearance" |