diff options
Diffstat (limited to 'release/scripts/startup')
9 files changed, 28 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_operators/node.py b/release/scripts/startup/bl_operators/node.py index 9839e0ee092..5c7f3c3f4b2 100644 --- a/release/scripts/startup/bl_operators/node.py +++ b/release/scripts/startup/bl_operators/node.py @@ -44,6 +44,9 @@ class NodeAddOperator(): node = tree.nodes.new(type=node_type) + if space.use_hidden_preview: + node.show_preview = False + node.select = True tree.nodes.active = node node.location = space.cursor_location diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index b38e2a7e98c..71178e6afac 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -509,7 +509,7 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): row.label() def OCEAN(self, layout, ob, md): - if not md.is_build_enabled: + if not bpy.app.build_options.mod_oceansim: layout.label("Built without OceanSim modifier") return diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index b9dcdc19162..c5dbe946012 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -162,7 +162,10 @@ class OBJECT_PT_groups(ObjectButtonsPanel, Panel): obj = context.object row = layout.row(align=True) - row.operator("object.group_link", text="Add to Group") + if bpy.data.groups: + row.operator("object.group_link", text="Add to Group") + else: + row.operator("object.group_add", text="Add to Group") row.operator("object.group_add", text="", icon='ZOOMIN') # XXX, this is bad practice, yes, I wrote it :( - campbell diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index f6784cbbaa3..d4a16b56b43 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -843,7 +843,12 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): col = split.column() col.label(text="Timing:") col.prop(part, "use_absolute_path_time") - col.prop(part, "path_start", text="Start", slider=not part.use_absolute_path_time) + + if part.type == 'HAIR' or psys.point_cache.is_baked: + col.prop(part, "path_start", text="Start", slider=not part.use_absolute_path_time) + else: + col.prop(part, "trail_count") + col.prop(part, "path_end", text="End", slider=not part.use_absolute_path_time) col.prop(part, "length_random", text="Random", slider=True) diff --git a/release/scripts/startup/bl_ui/properties_physics_fluid.py b/release/scripts/startup/bl_ui/properties_physics_fluid.py index 696e895fa67..b3cd5dc5464 100644 --- a/release/scripts/startup/bl_ui/properties_physics_fluid.py +++ b/release/scripts/startup/bl_ui/properties_physics_fluid.py @@ -51,7 +51,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, Panel): fluid = md.settings col = layout.column() - if fluid is None: + if not bpy.app.build_options.mod_fluid: col.label("Built without fluids") return diff --git a/release/scripts/startup/bl_ui/space_info.py b/release/scripts/startup/bl_ui/space_info.py index 51c975c3e70..d782bb1b3b9 100644 --- a/release/scripts/startup/bl_ui/space_info.py +++ b/release/scripts/startup/bl_ui/space_info.py @@ -157,7 +157,7 @@ class INFO_MT_file_import(Menu): bl_label = "Import" def draw(self, context): - if hasattr(bpy.types, "WM_OT_collada_import"): + if bpy.app.build_options.collada: self.layout.operator("wm.collada_import", text="Collada (Default) (.dae)") @@ -166,7 +166,7 @@ class INFO_MT_file_export(Menu): bl_label = "Export" def draw(self, context): - if hasattr(bpy.types, "WM_OT_collada_export"): + if bpy.app.build_options.collada: self.layout.operator("wm.collada_export", text="Collada (Default) (.dae)") diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index f33b8516ae6..2742e6d8155 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -528,9 +528,11 @@ class USERPREF_PT_system(Panel): if system.use_international_fonts: column.prop(system, "language") row = column.row() - row.label(text="Translate:") - row.prop(system, "use_translate_interface", text="Interface") - row.prop(system, "use_translate_tooltips", text="Tooltips") + row.label(text="Translate:", text_ctxt=bpy.app.translations.contexts.id_windowmanager) + row = column.row(True) + row.prop(system, "use_translate_interface", text="Interface", toggle=True) + row.prop(system, "use_translate_tooltips", text="Tooltips", toggle=True) + row.prop(system, "use_translate_new_dataname", text="New Data", toggle=True) class USERPREF_MT_interface_theme_presets(Menu): diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 7ecf2249b5c..08c161f65d8 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -111,6 +111,11 @@ class VIEW3D_HT_header(Header): elif snap_element == 'FACE': row.prop(toolsettings, "use_snap_project", text="") + # AutoMerge editing + if obj: + if (mode == 'EDIT' and obj.type == 'MESH'): + layout.prop(toolsettings, "use_mesh_automerge", text="", icon='AUTOMERGE_ON') + # OpenGL render row = layout.row(align=True) row.operator("render.opengl", text="", icon='RENDER_STILL') diff --git a/release/scripts/startup/bl_ui/space_view3d_toolbar.py b/release/scripts/startup/bl_ui/space_view3d_toolbar.py index 2e98cb68eb5..24e4dac4ded 100644 --- a/release/scripts/startup/bl_ui/space_view3d_toolbar.py +++ b/release/scripts/startup/bl_ui/space_view3d_toolbar.py @@ -180,6 +180,7 @@ class VIEW3D_PT_tools_meshedit(View3DPanel, Panel): props = row.operator("mesh.knife_tool", text="Select") props.use_occlude_geometry = False props.only_selected = True + col.operator("mesh.knife_project") col = layout.column(align=True) col.label(text="Remove:") |