diff options
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/modules/bpy_types.py | 6 | ||||
| -rw-r--r-- | release/scripts/ui/properties_object.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/properties_physics_common.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_image.py | 3 | ||||
| -rw-r--r-- | release/scripts/ui/space_sequencer.py | 2 | ||||
| -rw-r--r-- | release/scripts/ui/space_view3d.py | 4 |
6 files changed, 12 insertions, 7 deletions
diff --git a/release/scripts/modules/bpy_types.py b/release/scripts/modules/bpy_types.py index 5f327050668..6e4596a1109 100644 --- a/release/scripts/modules/bpy_types.py +++ b/release/scripts/modules/bpy_types.py @@ -45,21 +45,21 @@ class Object(bpy_types.ID): def children(self): """All the children of this object""" import bpy - return [child for child in bpy.data.objects if child.parent == self] + return tuple(child for child in bpy.data.objects if child.parent == self) @property def group_users(self): """The groups this object is in""" import bpy name = self.name - return [group for group in bpy.data.groups if name in group.objects] + return tuple(group for group in bpy.data.groups if name in group.objects) @property def scene_users(self): """The scenes this object is in""" import bpy name = self.name - return [scene for scene in bpy.data.scenes if name in scene.objects] + return tuple(scene for scene in bpy.data.scenes if name in scene.objects) class _GenericBone: diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py index 043a0d2434b..211a7f5c2e9 100644 --- a/release/scripts/ui/properties_object.py +++ b/release/scripts/ui/properties_object.py @@ -156,7 +156,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel): wide_ui = context.region.width > narrowui split = layout.split(percentage=0.8, align=True) - split.operator("object.group_link", text="Link to Group") + split.operator("object.group_link", text="Add to Group") split.operator("object.group_add", text="", icon='ZOOMIN') # XXX, this is bad practice, yes, I wrote it :( - campbell diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py index 20073c68989..cad1229a0de 100644 --- a/release/scripts/ui/properties_physics_common.py +++ b/release/scripts/ui/properties_physics_common.py @@ -73,6 +73,8 @@ def point_cache_ui(self, context, cache, enabled, particles, smoke): sub.prop(cache, "disk_cache") col.label(text=cache.info) + sub = col.column() + sub.prop(cache, "use_library_path", "Use Lib Path") layout.separator() diff --git a/release/scripts/ui/space_image.py b/release/scripts/ui/space_image.py index dd07f7b66f8..be7370302ec 100644 --- a/release/scripts/ui/space_image.py +++ b/release/scripts/ui/space_image.py @@ -29,7 +29,7 @@ class IMAGE_MT_view(bpy.types.Menu): layout = self.layout sima = context.space_data - # uv = sima.uv_editor + uv = sima.uv_editor toolsettings = context.tool_settings show_uvedit = sima.show_uvedit @@ -42,6 +42,7 @@ class IMAGE_MT_view(bpy.types.Menu): layout.prop(sima, "update_automatically") if show_uvedit: layout.prop(toolsettings, "uv_local_view") # Numpad / + layout.prop(uv, "draw_other_objects") layout.separator() diff --git a/release/scripts/ui/space_sequencer.py b/release/scripts/ui/space_sequencer.py index ca31e134e59..9460905bd85 100644 --- a/release/scripts/ui/space_sequencer.py +++ b/release/scripts/ui/space_sequencer.py @@ -382,11 +382,13 @@ class SEQUENCER_PT_preview(bpy.types.Panel): col.active = render.use_sequencer_gl_preview col.prop(render, "sequencer_gl_preview", text="") + ''' col = layout.column() col.prop(render, "use_sequencer_gl_render", text="Open GL Render") col = layout.column() col.active = render.use_sequencer_gl_render col.prop(render, "sequencer_gl_render", text="") + ''' class SEQUENCER_PT_effect(SequencerButtonsPanel): diff --git a/release/scripts/ui/space_view3d.py b/release/scripts/ui/space_view3d.py index 7b78d6c4299..a8fc4eb89af 100644 --- a/release/scripts/ui/space_view3d.py +++ b/release/scripts/ui/space_view3d.py @@ -835,8 +835,8 @@ class VIEW3D_MT_make_links(bpy.types.Menu): def draw(self, context): layout = self.layout - layout.operator_menu_enum("object.make_links_scene", "type", text="Objects to Scene...") - layout.operator_menu_enum("marker.make_links_scene", "type", text="Markers to Scene...") + layout.operator_menu_enum("object.make_links_scene", "scene", text="Objects to Scene...") + layout.operator_menu_enum("marker.make_links_scene", "scene", text="Markers to Scene...") layout.operator_enums("object.make_links_data", "type") # inline |