Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2011-11-30 00:36:34 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2011-11-30 00:36:34 +0400
commit8bff75697446a98d42a643aa8f65fa663d967765 (patch)
tree1d0fd2328335dce7bd448a14f4eb6e6365a22913 /release/scripts/startup/bl_operators/clip.py
parent11c3bdddb237b72383dda7f14970d14ddd888eed (diff)
Reverting previous ZCombine commit.
ZCombine solves particular cases only and confused other cases.
Diffstat (limited to 'release/scripts/startup/bl_operators/clip.py')
-rw-r--r--release/scripts/startup/bl_operators/clip.py19
1 files changed, 3 insertions, 16 deletions
diff --git a/release/scripts/startup/bl_operators/clip.py b/release/scripts/startup/bl_operators/clip.py
index 6ab480b4e23..269871b7230 100644
--- a/release/scripts/startup/bl_operators/clip.py
+++ b/release/scripts/startup/bl_operators/clip.py
@@ -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))