[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41268] branches/bmesh/blender: svn merge ^/trunk/blender -r41230:41266

Campbell Barton ideasman42 at gmail.com
Tue Oct 25 01:06:28 CEST 2011 

Revision: 41268
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41268
Author:   campbellbarton
Date:     2011-10-24 23:06:27 +0000 (Mon, 24 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r41230:41266

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

Modified Paths:
--------------
    branches/bmesh/blender/build_files/cmake/project_info.py
    branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/bmesh/blender/intern/itasc/Armature.cpp
    branches/bmesh/blender/intern/itasc/Armature.hpp
    branches/bmesh/blender/intern/itasc/Cache.cpp
    branches/bmesh/blender/intern/itasc/Cache.hpp
    branches/bmesh/blender/intern/itasc/ConstraintSet.cpp
    branches/bmesh/blender/intern/itasc/ConstraintSet.hpp
    branches/bmesh/blender/intern/itasc/ControlledObject.cpp
    branches/bmesh/blender/intern/itasc/ControlledObject.hpp
    branches/bmesh/blender/intern/itasc/CopyPose.cpp
    branches/bmesh/blender/intern/itasc/CopyPose.hpp
    branches/bmesh/blender/intern/itasc/Distance.cpp
    branches/bmesh/blender/intern/itasc/Distance.hpp
    branches/bmesh/blender/intern/itasc/FixedObject.cpp
    branches/bmesh/blender/intern/itasc/FixedObject.hpp
    branches/bmesh/blender/intern/itasc/MovingFrame.cpp
    branches/bmesh/blender/intern/itasc/MovingFrame.hpp
    branches/bmesh/blender/intern/itasc/Object.hpp
    branches/bmesh/blender/intern/itasc/Scene.cpp
    branches/bmesh/blender/intern/itasc/Scene.hpp
    branches/bmesh/blender/intern/itasc/Solver.hpp
    branches/bmesh/blender/intern/itasc/UncontrolledObject.cpp
    branches/bmesh/blender/intern/itasc/UncontrolledObject.hpp
    branches/bmesh/blender/intern/itasc/WDLSSolver.cpp
    branches/bmesh/blender/intern/itasc/WDLSSolver.hpp
    branches/bmesh/blender/intern/itasc/WSDLSSolver.cpp
    branches/bmesh/blender/intern/itasc/WSDLSSolver.hpp
    branches/bmesh/blender/intern/itasc/WorldObject.cpp
    branches/bmesh/blender/intern/itasc/WorldObject.hpp
    branches/bmesh/blender/intern/itasc/eigen_types.cpp
    branches/bmesh/blender/intern/itasc/eigen_types.hpp
    branches/bmesh/blender/intern/memutil/MEM_CacheLimiter.h
    branches/bmesh/blender/intern/memutil/MEM_CacheLimiterC-Api.h
    branches/bmesh/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
    branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
    branches/bmesh/blender/release/scripts/startup/bl_operators/wm.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/__init__.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_userpref.py
    branches/bmesh/blender/release/text/readme.html
    branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_library.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_sequencer.h
    branches/bmesh/blender/source/blender/blenkernel/intern/action.c
    branches/bmesh/blender/source/blender/blenkernel/intern/blender.c
    branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/library.c
    branches/bmesh/blender/source/blender/blenkernel/intern/seqcache.c
    branches/bmesh/blender/source/blender/blenkernel/intern/sequencer.c
    branches/bmesh/blender/source/blender/blenkernel/intern/writeffmpeg.c
    branches/bmesh/blender/source/blender/blenlib/BLI_math_vector.h
    branches/bmesh/blender/source/blender/blenlib/intern/math_vector_inline.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
    branches/bmesh/blender/source/blender/editors/space_outliner/outliner_draw.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_ops.c
    branches/bmesh/blender/source/blender/imbuf/CMakeLists.txt
    branches/bmesh/blender/source/blender/imbuf/IMB_imbuf.h
    branches/bmesh/blender/source/blender/imbuf/intern/allocimbuf.c
    branches/bmesh/blender/source/blender/imbuf/intern/indexer.c
    branches/bmesh/blender/source/blender/imbuf/intern/module.c
    branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_fcurve.c
    branches/bmesh/blender/source/blender/quicktime/quicktime_export.h
    branches/bmesh/blender/source/blender/render/intern/source/convertblender.c
    branches/bmesh/blender/source/gameengine/Converter/BL_ActionActuator.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/BL_Action.cpp

Added Paths:
-----------
    branches/bmesh/blender/source/blender/imbuf/IMB_moviecache.h
    branches/bmesh/blender/source/blender/imbuf/intern/moviecache.c

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
   - /trunk/blender:39992-41230
   + /trunk/blender:39992-41266

Modified: branches/bmesh/blender/build_files/cmake/project_info.py
===================================================================
--- branches/bmesh/blender/build_files/cmake/project_info.py	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/build_files/cmake/project_info.py	2011-10-24 23:06:27 UTC (rev 41268)
@@ -104,7 +104,7 @@
 
 def is_c(filename):
     ext = splitext(filename)[1]
-    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc"))
+    return (ext in (".c", ".cpp", ".cxx", ".m", ".mm", ".rc", ".cc"))
 
 
 def is_c_any(filename):

Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemCocoa.mm	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1685,6 +1685,10 @@
 				}
 			}
 
+			/* arrow keys should not have utf8 */
+			if ((keyCode > 266) && (keyCode < 271))
+				utf8_buf[0] = '\0';
+
 			if ((keyCode == GHOST_kKeyQ) && (m_modifierMask & NSCommandKeyMask))
 				break; //Cmd-Q is directly handled by Cocoa
 

Modified: branches/bmesh/blender/intern/itasc/Armature.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Armature.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Armature.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/Armature.cpp
  *  \ingroup itasc
  */
+/*
  * Armature.cpp
  *
  *  Created on: Feb 3, 2009

Modified: branches/bmesh/blender/intern/itasc/Armature.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Armature.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Armature.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/* 
  * Armature.hpp
  *
  *  Created on: Feb 3, 2009

Modified: branches/bmesh/blender/intern/itasc/Cache.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Cache.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Cache.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/Cache.cpp
  *  \ingroup itasc
  */
+/*
  * Cache.cpp
  *
  *  Created on: Feb 24, 2009

Modified: branches/bmesh/blender/intern/itasc/Cache.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Cache.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Cache.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * Cache.hpp
  *
  *  Created on: Feb 24, 2009

Modified: branches/bmesh/blender/intern/itasc/ConstraintSet.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/ConstraintSet.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/ConstraintSet.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/ConstraintSet.cpp
  *  \ingroup itasc
  */
+/*
  * ConstraintSet.cpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/ConstraintSet.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/ConstraintSet.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/ConstraintSet.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * ConstraintSet.hpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/ControlledObject.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/ControlledObject.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/ControlledObject.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/ControlledObject.cpp
  *  \ingroup itasc
  */
+/*
  * ControlledObject.cpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/ControlledObject.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/ControlledObject.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/ControlledObject.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * ControlledObject.hpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/CopyPose.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/CopyPose.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/CopyPose.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/CopyPose.cpp
  *  \ingroup itasc
  */
+/*
  * CopyPose.cpp
  *
  *  Created on: Mar 17, 2009

Modified: branches/bmesh/blender/intern/itasc/CopyPose.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/CopyPose.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/CopyPose.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * CopyPose.h
  *
  *  Created on: Mar 17, 2009

Modified: branches/bmesh/blender/intern/itasc/Distance.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Distance.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Distance.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/Distance.cpp
  *  \ingroup itasc
  */
+/*
  * Distance.cpp
  *
  *  Created on: Jan 30, 2009

Modified: branches/bmesh/blender/intern/itasc/Distance.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Distance.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Distance.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * Distance.hpp
  *
  *  Created on: Jan 30, 2009

Modified: branches/bmesh/blender/intern/itasc/FixedObject.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/FixedObject.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/FixedObject.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/FixedObject.cpp
  *  \ingroup itasc
  */
+/*
  * FixedObject.cpp
  *
  *  Created on: Feb 10, 2009

Modified: branches/bmesh/blender/intern/itasc/FixedObject.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/FixedObject.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/FixedObject.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * FixedObject.h
  *
  *  Created on: Feb 10, 2009

Modified: branches/bmesh/blender/intern/itasc/MovingFrame.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/MovingFrame.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/MovingFrame.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/MovingFrame.cpp
  *  \ingroup itasc
  */
+/*
  * MovingFrame.cpp
  *
  *  Created on: Feb 10, 2009

Modified: branches/bmesh/blender/intern/itasc/MovingFrame.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/MovingFrame.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/MovingFrame.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * MovingFrame.h
  *
  *  Created on: Feb 10, 2009

Modified: branches/bmesh/blender/intern/itasc/Object.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Object.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Object.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * Object.hpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/Scene.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Scene.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Scene.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/Scene.cpp
  *  \ingroup itasc
  */
+/*
  * Scene.cpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/Scene.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Scene.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Scene.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * Scene.hpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/Solver.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/Solver.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/Solver.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * Solver.hpp
  *
  *  Created on: Jan 8, 2009

Modified: branches/bmesh/blender/intern/itasc/UncontrolledObject.cpp
===================================================================
--- branches/bmesh/blender/intern/itasc/UncontrolledObject.cpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/UncontrolledObject.cpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,6 +1,7 @@
 /** \file itasc/UncontrolledObject.cpp
  *  \ingroup itasc
  */
+/*
  * UncontrolledObject.cpp
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/UncontrolledObject.hpp
===================================================================
--- branches/bmesh/blender/intern/itasc/UncontrolledObject.hpp	2011-10-24 22:51:44 UTC (rev 41267)
+++ branches/bmesh/blender/intern/itasc/UncontrolledObject.hpp	2011-10-24 23:06:27 UTC (rev 41268)
@@ -1,3 +1,4 @@
+/*
  * UncontrolledObject.h
  *
  *  Created on: Jan 5, 2009

Modified: branches/bmesh/blender/intern/itasc/WDLSSolver.cpp

@@ Diff output truncated at 10240 characters. @@

More information about the Bf-blender-cvs mailing list