[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42262] branches/bmesh/blender: svn merge ^/trunk/blender -r42245:42261

Campbell Barton ideasman42 at gmail.com
Tue Nov 29 19:19:04 CET 2011 

Revision: 42262
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42262
Author:   campbellbarton
Date:     2011-11-29 18:18:56 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42245:42261

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

Modified Paths:
--------------
    branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_bmesh.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_bmeshCustomData.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
    branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
    branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c
    branches/bmesh/blender/source/blender/editors/armature/reeb.c
    branches/bmesh/blender/source/blender/editors/include/UI_resources.h
    branches/bmesh/blender/source/blender/editors/interface/resources.c
    branches/bmesh/blender/source/blender/editors/object/object_bake.c
    branches/bmesh/blender/source/blender/editors/physics/physics_intern.h
    branches/bmesh/blender/source/blender/editors/space_file/filelist.h
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
    branches/bmesh/blender/source/blender/editors/util/undo.c
    branches/bmesh/blender/source/blender/gpu/GPU_buffers.h
    branches/bmesh/blender/source/blender/gpu/GPU_draw.h
    branches/bmesh/blender/source/blender/gpu/GPU_extensions.h
    branches/bmesh/blender/source/blender/gpu/GPU_material.h
    branches/bmesh/blender/source/blender/gpu/intern/gpu_buffers.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_codegen.h
    branches/bmesh/blender/source/blender/gpu/intern/gpu_draw.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_extensions.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_tracking.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/modifiers/MOD_modifiertypes.h
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_none.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_util.h
    branches/bmesh/blender/source/blender/nodes/NOD_composite.h
    branches/bmesh/blender/source/blender/nodes/NOD_shader.h
    branches/bmesh/blender/source/blender/nodes/NOD_texture.h
    branches/bmesh/blender/source/blender/python/generic/CMakeLists.txt
    branches/bmesh/blender/source/blender/python/intern/bpy_driver.c
    branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
    branches/bmesh/blender/source/blender/python/intern/gpu.h
    branches/bmesh/blender/source/blender/python/mathutils/CMakeLists.txt
    branches/bmesh/blender/source/blender/python/mathutils/mathutils.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils.h
    branches/bmesh/blender/source/blender/render/intern/include/render_types.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/blender/windowmanager/WM_api.h
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_jobs.c
    branches/bmesh/blender/source/gameengine/GamePlayer/xembed/CMakeLists.txt
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ObstacleSimulation.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ParentActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_ParentActuator.h
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SteeringActuator.h
    branches/bmesh/blender/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp

Added Paths:
-----------
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.c
    branches/bmesh/blender/source/blender/python/mathutils/mathutils_noise.h

Removed Paths:
-------------
    branches/bmesh/blender/source/blender/python/generic/noise_py_api.c
    branches/bmesh/blender/source/blender/python/generic/noise_py_api.h

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/release/
    branches/bmesh/blender/source/blender/editors/space_outliner/


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

Modified: branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
===================================================================
--- branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp	2011-11-29 18:18:56 UTC (rev 42262)
@@ -1,14 +1,10 @@
-/** \file memutil/intern/MEM_CacheLimiterC-Api.cpp
- *  \ingroup memutil
- */
-/**
+/*
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -21,8 +17,13 @@
  *
  * Contributor(s): Peter Schlaile <peter at schlaile.de> 2005
  *
+ * ***** BEGIN GPL LICENSE BLOCK *****
  */
 
+/** \file memutil/intern/MEM_CacheLimiterC-Api.cpp
+ *  \ingroup memutil
+ */
+
 #include <cstddef>
 
 #include "MEM_CacheLimiter.h"


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

Modified: branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/release/scripts/startup/bl_operators/clip.py	2011-11-29 18:18:56 UTC (rev 42262)
@@ -531,6 +531,7 @@
         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
@@ -560,6 +561,8 @@
 
         vector_blur.factor = 0.75
 
+        zcomb.use_alpha = True
+
         # create links
         tree.links.new(movieclip.outputs['Image'], distortion.inputs['Image'])
 
@@ -588,8 +591,14 @@
         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(vector_blur.outputs['Image'], alphaover.inputs[2])
+        tree.links.new(zcomb.outputs['Image'], alphaover.inputs[2])
 
         tree.links.new(alphaover.outputs['Image'], composite.inputs['Image'])
         tree.links.new(alphaover.outputs['Image'], viewer.inputs['Image'])
@@ -632,13 +641,17 @@
         rlayer_fg.location = rlayer_bg.location
         rlayer_fg.location -= Vector((0.0, 500.0))
 
-        vector_blur.location[0] = mul_image.location[0]
+        vector_blur.location[0] = mul_image.location[0] - 200
         vector_blur.location[1] = rlayer_fg.location[1]
 
-        alphaover.location[0] = vector_blur.location[0] + 350
+        alphaover.location[0] = vector_blur.location[0] + 700
         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_clip.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_clip.py	2011-11-29 18:18:56 UTC (rev 42262)
@@ -814,7 +814,7 @@
         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):

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_bmesh.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_bmesh.h	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_bmesh.h	2011-11-29 18:18:56 UTC (rev 42262)
@@ -4,10 +4,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.	
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_bmeshCustomData.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_bmeshCustomData.h	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_bmeshCustomData.h	2011-11-29 18:18:56 UTC (rev 42262)
@@ -4,10 +4,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.	
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_node.h	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_node.h	2011-11-29 18:18:56 UTC (rev 42262)
@@ -4,10 +4,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h	2011-11-29 18:18:56 UTC (rev 42262)
@@ -4,10 +4,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.	
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/BME_Customdata.c	2011-11-29 18:18:56 UTC (rev 42262)
@@ -10,10 +10,7 @@
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. The Blender
- * Foundation also sells licenses for use in proprietary software under
- * the Blender License.  See http://www.blender.org/BL/ for information
- * about this.	
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

Modified: branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c
===================================================================
--- branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c	2011-11-29 17:41:15 UTC (rev 42261)
+++ branches/bmesh/blender/source/blender/blenlib/intern/scanfill.c	2011-11-29 18:18:56 UTC (rev 42262)
@@ -706,7 +706,7 @@
 					ed1->v1->h--; 
 					ed1->v2->h--;

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list