[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43463] branches/bmesh/blender: svn merge ^/trunk/blender -r43443:43461

Campbell Barton ideasman42 at gmail.com
Tue Jan 17 18:08:33 CET 2012


Revision: 43463
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43463
Author:   campbellbarton
Date:     2012-01-17 17:08:32 +0000 (Tue, 17 Jan 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r43443:43461

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

Modified Paths:
--------------
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
    branches/bmesh/blender/build_files/scons/tools/btools.py
    branches/bmesh/blender/extern/carve/SConscript
    branches/bmesh/blender/extern/carve/include/carve/win32.h
    branches/bmesh/blender/intern/boolop/SConscript
    branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
    branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
    branches/bmesh/blender/source/blender/blenkernel/intern/armature.c
    branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
    branches/bmesh/blender/source/blender/editors/mesh/loopcut.c
    branches/bmesh/blender/source/blender/editors/space_info/info_ops.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_snap.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
    branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
    branches/bmesh/blender/source/creator/CMakeLists.txt

Removed Paths:
-------------
    branches/bmesh/blender/source/blender/blenkernel/BKE_array_mallocn.h

Property Changed:
----------------
    branches/bmesh/blender/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43443
   + /branches/soc-2011-cucumber:37517,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801
/trunk/blender:39992-43461

Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/SConstruct	2012-01-17 17:08:32 UTC (rev 43463)
@@ -147,9 +147,8 @@
         env.Tool('mstoolkit', [toolpath])
     else:
         env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
-        # xxx commented out, as was supressing warnings under mingw..
-        #if env:
-        #    btools.SetupSpawn(env)
+        if env:
+            btools.SetupSpawn(env)
 else:
     if bitness==64 and platform=='win32':
         env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')

Modified: branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake	2012-01-17 17:08:32 UTC (rev 43463)
@@ -15,6 +15,7 @@
 set(WITH_CYCLES              OFF CACHE FORCE BOOL)
 set(WITH_FFTW3               OFF CACHE FORCE BOOL)
 set(WITH_LIBMV               OFF CACHE FORCE BOOL)
+set(WITH_CARVE               OFF CACHE FORCE BOOL)
 set(WITH_GAMEENGINE          OFF CACHE FORCE BOOL)
 set(WITH_IK_ITASC            OFF CACHE FORCE BOOL)
 set(WITH_IMAGE_CINEON        OFF CACHE FORCE BOOL)
@@ -33,6 +34,7 @@
 set(WITH_MOD_BOOLEAN         OFF CACHE FORCE BOOL)
 set(WITH_MOD_DECIMATE        OFF CACHE FORCE BOOL)
 set(WITH_MOD_FLUID           OFF CACHE FORCE BOOL)
+set(WITH_MOD_REMESH          OFF CACHE FORCE BOOL)
 set(WITH_MOD_SMOKE           OFF CACHE FORCE BOOL)
 set(WITH_MOD_OCEANSIM        OFF CACHE FORCE BOOL)
 set(WITH_AUDASPACE           OFF CACHE FORCE BOOL)
@@ -43,3 +45,4 @@
 set(WITH_RAYOPTIMIZATION     OFF CACHE FORCE BOOL)
 set(WITH_SDL                 OFF CACHE FORCE BOOL)
 set(WITH_X11_XINPUT          OFF CACHE FORCE BOOL)
+set(WITH_X11_XF86VMODE       OFF CACHE FORCE BOOL)

Modified: branches/bmesh/blender/build_files/scons/tools/btools.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/btools.py	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/build_files/scons/tools/btools.py	2012-01-17 17:08:32 UTC (rev 43463)
@@ -222,15 +222,15 @@
         newargs = string.join(args[1:], ' ')
         cmdline = cmd + " " + newargs
         startupinfo = subprocess.STARTUPINFO()
-        startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
+        #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW
         proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE,
             stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False)
         data, err = proc.communicate()
         rv = proc.wait()
-        if rv:
-            print "====="
-            print err
-            print "====="
+        if data:
+            print(data)
+        if err:
+            print(err)
         return rv
 
 def SetupSpawn( env ):

Modified: branches/bmesh/blender/extern/carve/SConscript
===================================================================
--- branches/bmesh/blender/extern/carve/SConscript	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/extern/carve/SConscript	2012-01-17 17:08:32 UTC (rev 43463)
@@ -14,7 +14,8 @@
 if env['WITH_BF_BOOST']:
     if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
         # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
-        defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+        if env['OURPLATFORM'] != 'win32-mingw':
+            defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
 
     defs.append('CARVE_SYSTEM_BOOST')
     incs.append(env['BF_BOOST_INC'])

Modified: branches/bmesh/blender/extern/carve/include/carve/win32.h
===================================================================
--- branches/bmesh/blender/extern/carve/include/carve/win32.h	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/extern/carve/include/carve/win32.h	2012-01-17 17:08:32 UTC (rev 43463)
@@ -8,9 +8,11 @@
 #include <string.h>
 #include <stdlib.h>
 
+#if !defined(__MINGW32__)
 inline int strcasecmp(const char *a, const char *b) {
   return _stricmp(a,b);
 }
+#endif
 
 inline void srandom(unsigned long input) {
   srand(input);

Modified: branches/bmesh/blender/intern/boolop/SConscript
===================================================================
--- branches/bmesh/blender/intern/boolop/SConscript	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/intern/boolop/SConscript	2012-01-17 17:08:32 UTC (rev 43463)
@@ -17,7 +17,8 @@
     if env['WITH_BF_BOOST']:
         if env['OURPLATFORM'] not in ('win32-vc', 'win64-vc'):
             # Boost is setting as preferred collections library in the Carve code when using MSVC compiler
-            defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
+            if env['OURPLATFORM'] != 'win32-mingw':
+                defs.append('HAVE_BOOST_UNORDERED_COLLECTIONS')
 
         defs.append('CARVE_SYSTEM_BOOST')
         incs +=  ' ' + env['BF_BOOST_INC']

Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_armature.h	2012-01-17 17:08:32 UTC (rev 43463)
@@ -114,6 +114,10 @@
 void pchan_to_mat4(struct bPoseChannel *pchan, float chan_mat[4][4]);
 void pchan_calc_mat(struct bPoseChannel *pchan);
 
+/* Get the "pchan to pose" transform matrix. These matrices apply the effects of
+ * HINGE/NO_SCALE/NO_LOCAL_LOCATION options over the pchan loc/rot/scale transformations. */
+void pchan_to_pose_mat(struct bPoseChannel *pchan, float rotscale_mat[][4], float loc_mat[][4]);
+
 /* Rotation Mode Conversions - Used for PoseChannels + Objects... */
 void BKE_rotMode_change_values(float quat[4], float eul[3], float axis[3], float *angle, short oldMode, short newMode);
 

Deleted: branches/bmesh/blender/source/blender/blenkernel/BKE_array_mallocn.h
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/BKE_array_mallocn.h	2012-01-17 17:02:33 UTC (rev 43462)
+++ branches/bmesh/blender/source/blender/blenkernel/BKE_array_mallocn.h	2012-01-17 17:08:32 UTC (rev 43463)
@@ -1,85 +0,0 @@
-/*
- * ***** 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.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
- * All rights reserved.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-#ifndef BKE_ARRAY_MALLOCN_H
-#define BKE_ARRAY_MALLOCN_H
-
-/** \file BKE_array_mallocn.h
- *  \ingroup bke
- *  \brief little array macro library.
- */
-
-/* example of usage:
- *
- * int *arr = NULL;
- * V_DECLARE(arr);
- * int i;
- *
- * for (i=0; i<10; i++) {
- * 	V_GROW(arr);
- * 	arr[i] = something;
- * }
- * V_FREE(arr);
- *
- * arrays are buffered, using double-buffering (so on each reallocation,
- * the array size is doubled).  supposedly this should give good Big Oh
- * behaviour, though it may not be the best in practice.
- */
-
-#define V_DECLARE(vec) int _##vec##_count=0; void *_##vec##_tmp
-
-/* in the future, I plan on having V_DECLARE allocate stack memory it'll
- * use at first, and switch over to heap when it needs more.  that'll mess
- * up cases where you'd want to use this API to build a dynamic list for
- * non-local use, so all such cases should use this macro.*/
-#define V_DYNDECLARE(vec) V_DECLARE(vec)
-
-/*this returns the entire size of the array, including any buffering.*/
-#define V_SIZE(vec) ((signed int)((vec)==NULL ? 0 : MEM_allocN_len(vec) / sizeof(*vec)))
-
-/*this returns the logical size of the array, not including buffering.*/
-#define V_COUNT(vec) _##vec##_count
-
-/*grow the array by one.  zeroes the new elements.*/
-#define V_GROW(vec) \
-	V_SIZE(vec) > _##vec##_count ? _##vec##_count++ : \
-	((_##vec##_tmp = MEM_callocN(sizeof(*vec)*(_##vec##_count*2+2), #vec " " __FILE__ " ")),\
-	(void)(vec && memcpy(_##vec##_tmp, vec, sizeof(*vec) * _##vec##_count)),\
-	(void)(vec && (MEM_freeN(vec),1)),\
-	(vec = _##vec##_tmp),\
-	_##vec##_count++)
-
-#define V_FREE(vec) if (vec) MEM_freeN(vec);
-
-/*resets the logical size of an array to zero, but doesn't
-  free the memory.*/
-#define V_RESET(vec) _##vec##_count=0
-
-/*set the count of the array*/
-#define V_SETCOUNT(vec, count) _##vec##_count = (count)
-
-#endif // BKE_ARRAY_MALLOCN_H

Modified: branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-blender-cvs mailing list