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

Merging r42193 through r42349 from trunk into soc-2011-tomato

Browse Source
This commit is contained in:
Sergey Sharybin
2011-12-02 19:40:20 +00:00
parent 48c5820049 069f46ac89
commit b7aefff198
219 changed files with 5751 additions and 5039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
release/scripts/startup/bl_operators/clip.py
View File

@@ -40,14 +40,14 @@ def CLIP_set_viewport_background(context, all_screens, clip, clip_user):
bgpic = None
for x in space_v3d.background_images:
if x.source == 'MOVIE':
if x.source == 'MOVIE_CLIP':
bgpic = x
break
if not bgpic:
bgpic = space_v3d.background_images.new()
bgpic.source = 'MOVIE'
bgpic.source = 'MOVIE_CLIP'
bgpic.clip = clip
bgpic.clip_user.proxy_render_size = user.proxy_render_size
bgpic.clip_user.use_render_undistorted = True

16
release/scripts/startup/bl_ui/space_clip.py
View File

@@ -105,7 +105,7 @@ class CLIP_PT_tools_marker(Panel):
box = layout.box()
row = box.row(align=True)
row.prop(settings, "show_default_expanded", text="", emboss=False)
row.label(text="Default Settings")
row.label(text="Tracking Settings")
if settings.show_default_expanded:
col = box.column()
@@ -120,9 +120,9 @@ class CLIP_PT_tools_marker(Panel):
col.separator()
col2 = col.column(align=True)
col2.prop(settings, "default_pattern_size")
col2.prop(settings, "default_search_size")
sub = col.column(align=True)
sub.prop(settings, "default_pattern_size")
sub.prop(settings, "default_search_size")
col.label(text="Tracker:")
col.prop(settings, "default_tracker", text="")
@@ -134,9 +134,9 @@ class CLIP_PT_tools_marker(Panel):
col.separator()
col2 = col.column(align=True)
col2.prop(settings, "default_frames_limit")
col2.prop(settings, "default_margin")
sub = col.column(align=True)
sub.prop(settings, "default_frames_limit")
sub.prop(settings, "default_margin")
col.label(text="Match:")
col.prop(settings, "default_pattern_match", text="")
@@ -814,7 +814,7 @@ class CLIP_MT_reconstruction(Menu):
layout.separator()
layout.operator("clip.track_to_empty")
layout.operator("clip.tracks_to_mesh")
layout.operator("clip.bundles_to_mesh")
class CLIP_MT_track_visibility(Menu):

4
release/scripts/startup/bl_ui/space_info.py
View File

@@ -359,8 +359,8 @@ class INFO_MT_help(Menu):
layout = self.layout
layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:Manual'
layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-260/'
layout.operator("wm.url_open", text="Manual", icon='HELP').url = 'http://wiki.blender.org/index.php/Doc:2.6/Manual'
layout.operator("wm.url_open", text="Release Log", icon='URL').url = 'http://www.blender.org/development/release-logs/blender-261/'
layout.separator()

10
release/scripts/startup/bl_ui/space_view3d.py
View File

@@ -2296,10 +2296,16 @@ class VIEW3D_PT_background_image(Panel):
row.prop(bg, "show_expanded", text="", emboss=False)
if bg.source == 'IMAGE' and bg.image:
row.prop(bg.image, "name", text="", emboss=False)
elif bg.source == 'MOVIE' and bg.clip:
elif bg.source == 'MOVIE_CLIP' and bg.clip:
row.prop(bg.clip, "name", text="", emboss=False)
else:
row.label(text="Not Set")
if bg.show_background_image:
row.prop(bg, "show_background_image", text="", emboss=False, icon='RESTRICT_VIEW_OFF')
else:
row.prop(bg, "show_background_image", text="", emboss=False, icon='RESTRICT_VIEW_ON')
row.operator("view3d.background_image_remove", text="", emboss=False, icon='X').index = i
box.prop(bg, "view_axis", text="Axis")
@@ -2316,7 +2322,7 @@ class VIEW3D_PT_background_image(Panel):
box.template_image(bg, "image", bg.image_user, compact=True)
has_bg = True
elif bg.source == 'MOVIE':
elif bg.source == 'MOVIE_CLIP':
box.prop(bg, 'use_camera_clip')
column = box.column()

2
release/scripts/startup/keyingsets_builtins.py
View File

@@ -354,7 +354,7 @@ class BUILTIN_KSI_WholeCharacter(KeyingSetInfo):
# custom properties
def doCustomProps(ksi, ks, bone):
prop_type_compat = {bpy.types.BooleanProperty,
prop_type_compat = {bpy.types.BoolProperty,
bpy.types.IntProperty,
bpy.types.FloatProperty}