griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 28685.

Browse Source
This commit is contained in:
Tamito Kajiyama
2010-05-09 12:42:19 +00:00
parent 8a20433f0f 80f6671dfe
commit 1e30f00030
212 changed files with 4139 additions and 8374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
release/scripts/modules/bpy_types.py
View File

@@ -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:

2
release/scripts/ui/properties_object.py
View File

@@ -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

2
release/scripts/ui/properties_physics_common.py
View File

@@ -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()

3
release/scripts/ui/space_image.py
View File

@@ -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()

2
release/scripts/ui/space_sequencer.py
View File

@@ -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):

4
release/scripts/ui/space_view3d.py
View File

@@ -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