archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

svn merge ^/trunk/blender -r42261:42290

Browse Source
This commit is contained in:
Campbell Barton
2011-11-30 09:31:11 +00:00
parent 274080025d c9edbab08a
commit 9e5b28cd42
62 changed files with 587 additions and 458 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
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
@@ -531,7 +531,6 @@ class CLIP_OT_setup_tracking_scene(Operator):
vector_blur = tree.nodes.new(type='VECBLUR')
alphaover = tree.nodes.new(type='ALPHAOVER')
viewer = tree.nodes.new(type='VIEWER')
zcomb = tree.nodes.new(type='ZCOMBINE')
# setup nodes
movieclip.clip = clip
@@ -561,8 +560,6 @@ class CLIP_OT_setup_tracking_scene(Operator):
vector_blur.factor = 0.75
zcomb.use_alpha = True
# create links
tree.links.new(movieclip.outputs['Image'], distortion.inputs['Image'])
@@ -591,14 +588,8 @@ class CLIP_OT_setup_tracking_scene(Operator):
tree.links.new(rlayer_fg.outputs['Z'], vector_blur.inputs['Z'])
tree.links.new(rlayer_fg.outputs['Speed'], vector_blur.inputs['Speed'])
tree.links.new(vector_blur.outputs['Image'], zcomb.inputs[0])
tree.links.new(rlayer_fg.outputs['Z'], zcomb.inputs[1])
tree.links.new(mul_image.outputs['Image'], zcomb.inputs[2])
tree.links.new(rlayer_bg.outputs['Z'], zcomb.inputs[3])
tree.links.new(mul_image.outputs['Image'], alphaover.inputs[1])
tree.links.new(zcomb.outputs['Image'], alphaover.inputs[2])
tree.links.new(vector_blur.outputs['Image'], alphaover.inputs[2])
tree.links.new(alphaover.outputs['Image'], composite.inputs['Image'])
tree.links.new(alphaover.outputs['Image'], viewer.inputs['Image'])
@@ -641,17 +632,13 @@ class CLIP_OT_setup_tracking_scene(Operator):
rlayer_fg.location = rlayer_bg.location
rlayer_fg.location -= Vector((0.0, 500.0))
vector_blur.location[0] = mul_image.location[0] - 200
vector_blur.location[0] = mul_image.location[0]
vector_blur.location[1] = rlayer_fg.location[1]
alphaover.location[0] = vector_blur.location[0] + 700
alphaover.location[0] = vector_blur.location[0] + 350
alphaover.location[1] = \
(vector_blur.location[1] + mul_image.location[1]) / 2
zcomb.location[0] = vector_blur.location[0] + 450
zcomb.location[1] = \
(vector_blur.location[1] + mul_image.location[1]) / 3 * 2
composite.location = alphaover.location
composite.location += Vector((200.0, -100.0))

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

@@ -362,7 +362,7 @@ 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:2.6/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="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

@@ -2301,10 +2301,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")
@@ -2321,7 +2327,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()