[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42291] branches/bmesh/blender: svn merge ^/trunk/blender -r42261:42290

Campbell Barton ideasman42 at gmail.com
Wed Nov 30 10:31:18 CET 2011


Revision: 42291
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42291
Author:   campbellbarton
Date:     2011-11-30 09:31:11 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42261:42290

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42261

Modified Paths:
--------------
    branches/bmesh/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
    branches/bmesh/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc
    branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
    branches/bmesh/blender/release/text/readme.html
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_deform.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
    branches/bmesh/blender/source/blender/blenkernel/intern/anim.c
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/blenkernel/intern/brush.c
    branches/bmesh/blender/source/blender/blenkernel/intern/camera.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
    branches/bmesh/blender/source/blender/blenkernel/intern/image.c
    branches/bmesh/blender/source/blender/blenkernel/intern/lamp.c
    branches/bmesh/blender/source/blender/blenkernel/intern/lattice.c
    branches/bmesh/blender/source/blender/blenkernel/intern/library.c
    branches/bmesh/blender/source/blender/blenkernel/intern/material.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mball.c
    branches/bmesh/blender/source/blender/blenkernel/intern/mesh.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/particle.c
    branches/bmesh/blender/source/blender/blenkernel/intern/speaker.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenkernel/intern/world.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/include/ED_screen.h
    branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
    branches/bmesh/blender/source/blender/editors/object/object_constraint.c
    branches/bmesh/blender/source/blender/editors/object/object_transform.c
    branches/bmesh/blender/source/blender/editors/object/object_vgroup.c
    branches/bmesh/blender/source/blender/editors/render/render_opengl.c
    branches/bmesh/blender/source/blender/editors/screen/area.c
    branches/bmesh/blender/source/blender/editors/space_clip/clip_draw.c
    branches/bmesh/blender/source/blender/editors/space_image/image_draw.c
    branches/bmesh/blender/source/blender/editors/space_node/drawnode.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_tools.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
    branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_weightvg_util.c
    branches/bmesh/blender/source/blender/python/intern/bpy_library.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils.h
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Color.h
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Euler.h
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Matrix.h
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.h
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.h


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42261
   + /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42290

Modified: branches/bmesh/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc
===================================================================
--- branches/bmesh/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/extern/libmv/libmv/tracking/esm_region_tracker.cc	2011-11-30 09:31:11 UTC (rev 42291)
@@ -31,7 +31,7 @@
 namespace libmv {
 
 // TODO(keir): Reduce duplication between here and the other region trackers.
-bool RegionIsInBounds(const FloatImage &image1,
+static bool RegionIsInBounds(const FloatImage &image1,
                       double x, double y,
                       int half_window_size) {
   // Check the minimum coordinates.
@@ -56,7 +56,7 @@
 
 // Sample a region centered at x,y in image with size extending by half_width
 // from x,y. Channels specifies the number of channels to sample from.
-void SamplePattern(const FloatImage &image,
+static void SamplePattern(const FloatImage &image,
                    double x, double y,
                    int half_width,
                    int channels,
@@ -74,7 +74,7 @@
 
 // Estimate "reasonable" error by computing autocorrelation for a small shift.
 // TODO(keir): Add a facility for 
-double EstimateReasonableError(const FloatImage &image,
+static double EstimateReasonableError(const FloatImage &image,
                                double x, double y,
                                int half_width) {
   double error = 0.0;

Modified: branches/bmesh/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc
===================================================================
--- branches/bmesh/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/extern/libmv/libmv/tracking/klt_region_tracker.cc	2011-11-30 09:31:11 UTC (rev 42291)
@@ -63,7 +63,7 @@
   }
 }
 
-bool RegionIsInBounds(const FloatImage &image1,
+static bool RegionIsInBounds(const FloatImage &image1,
                       double x, double y,
                       int half_window_size) {
   // Check the minimum coordinates.

Modified: branches/bmesh/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc
===================================================================
--- branches/bmesh/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/extern/libmv/libmv/tracking/lmicklt_region_tracker.cc	2011-11-30 09:31:11 UTC (rev 42291)
@@ -29,7 +29,7 @@
 namespace libmv {
 
 // TODO(keir): Reduce duplication between here and the other region trackers.
-bool RegionIsInBounds(const FloatImage &image1,
+static bool RegionIsInBounds(const FloatImage &image1,
                       double x, double y,
                       int half_window_size) {
   // Check the minimum coordinates.
@@ -54,7 +54,7 @@
 
 // Sample a region centered at x,y in image with size extending by half_width
 // from x,y. Channels specifies the number of channels to sample from.
-void SamplePattern(const FloatImage &image,
+static void SamplePattern(const FloatImage &image,
                    double x, double y,
                    int half_width,
                    int channels,
@@ -71,7 +71,7 @@
 }
 
 // Estimate "reasonable" error by computing autocorrelation for a small shift.
-double EstimateReasonableError(const FloatImage &image,
+static double EstimateReasonableError(const FloatImage &image,
                                double x, double y,
                                int half_width) {
   double error = 0.0;

Modified: branches/bmesh/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc
===================================================================
--- branches/bmesh/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/extern/libmv/libmv/tracking/trklt_region_tracker.cc	2011-11-30 09:31:11 UTC (rev 42291)
@@ -81,7 +81,7 @@
   *e = (A + lambda*Mat2f::Identity())*Di*(V - W) + 0.5*(S - R);
 }
 
-bool RegionIsInBounds(const FloatImage &image1,
+static bool RegionIsInBounds(const FloatImage &image1,
                       double x, double y,
                       int half_window_size) {
   // Check the minimum coordinates.


Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender/release:31524-42261
   + /trunk/blender/release:31524-42290

Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2011-11-30 09:31:11 UTC (rev 42291)
@@ -40,14 +40,14 @@
         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 @@
         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 @@
 
         vector_blur.factor = 0.75
 
-        zcomb.use_alpha = True
-
         # create links
         tree.links.new(movieclip.outputs['Image'], distortion.inputs['Image'])
 
@@ -591,14 +588,8 @@
         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 @@
         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))
 

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_info.py	2011-11-30 09:31:11 UTC (rev 42291)
@@ -362,7 +362,7 @@
         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()
 

Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py	2011-11-30 08:03:20 UTC (rev 42290)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py	2011-11-30 09:31:11 UTC (rev 42291)
@@ -2301,10 +2301,16 @@
             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 @@
                         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()

Modified: branches/bmesh/blender/release/text/readme.html
===================================================================
--- branches/bmesh/blender/release/text/readme.html	2011-11-30 08:03:20 UTC (rev 42290)

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list