[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45936] branches/soc-2011-tomato: Merging r45928 through r45935 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Tue Apr 24 18:36:34 CEST 2012
Revision: 45936
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45936
Author: nazgul
Date: 2012-04-24 16:36:34 +0000 (Tue, 24 Apr 2012)
Log Message:
-----------
Merging r45928 through r45935 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45928
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45935
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h
branches/soc-2011-tomato/intern/audaspace/intern/AUD_Buffer.cpp
branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometrymodel.cpp
branches/soc-2011-tomato/source/blender/editors/object/object_group.c
branches/soc-2011-tomato/source/gameengine/Expressions/KX_HashedPtr.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPO_SGController.cpp
Removed Paths:
-------------
branches/soc-2011-tomato/extern/bullet2/patches/
branches/soc-2011-tomato/intern/audaspace/patches/
branches/soc-2011-tomato/intern/elbeem/patches/
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45927
+ /branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-45935
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/CMakeLists.txt 2012-04-24 16:36:34 UTC (rev 45936)
@@ -1008,10 +1008,8 @@
if(WITH_MINGW64)
#Yes, the point for MinGW64 is moar optimization by default :)
- set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2")
- set(CMAKE_C_FLAGS_RELEASE "-O3 -DNDEBUG")
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG")
- #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
+ set(PLATFORM_CFLAGS "${PLATFORM_CFLAGS} -mmmx -msse -msse2 -O3")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive")
set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread")
add_definitions(-DFREE_WINDOWS64 -DMS_WIN64)
Modified: branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/build_files/scons/config/win64-mingw-config.py 2012-04-24 16:36:34 UTC (rev 45936)
@@ -176,7 +176,7 @@
CXX = 'g++'
CCFLAGS = [ '-pipe', '-funsigned-char', '-fno-strict-aliasing' ]
-#CXXFLAGS = [ '-fpermissive' ]
+CXXFLAGS = [ '-fpermissive' ]
CPPFLAGS = ['-DWIN32', '-DMS_WIN64', '-DFREE_WINDOWS', '-DFREE_WINDOWS64', '-D_LARGEFILE_SOURCE', '-D_FILE_OFFSET_BITS=64', '-D_LARGEFILE64_SOURCE', '-DBOOST_ALL_NO_LIB', '-DBOOST_THREAD_USE_LIB', '-DGLEW_STATIC', '-D_SSIZE_T_']
REL_CFLAGS = ['-O3', '-mmmx', '-msse', '-msse2']
Modified: branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btSerializer.h 2012-04-24 16:36:34 UTC (rev 45936)
@@ -25,15 +25,8 @@
#endif
#include <string.h>
-#if defined(_WIN64)
-# ifdef __MINGW64__
-# include <basetsd.h>
-# endif
-typedef __int64 int_ptr;
-#else
-typedef long int_ptr;
-#endif
+
///only the 32bit versions for now
extern unsigned char sBulletDNAstr[];
extern int sBulletDNAlen;
@@ -254,7 +247,7 @@
cp++;
}
{
- nr= (int_ptr)cp;
+ nr= (long)cp;
// long mask=3;
nr= ((nr+3)&~3)-nr;
while (nr--)
@@ -289,7 +282,7 @@
}
{
- nr= (int_ptr)cp;
+ nr= (long)cp;
// long mask=3;
nr= ((nr+3)&~3)-nr;
while (nr--)
Modified: branches/soc-2011-tomato/intern/audaspace/intern/AUD_Buffer.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/intern/AUD_Buffer.cpp 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/intern/audaspace/intern/AUD_Buffer.cpp 2012-04-24 16:36:34 UTC (rev 45936)
@@ -33,17 +33,8 @@
#include <cstring>
#include <cstdlib>
-#if defined(_WIN64)
-# ifdef __MINGW64__
-# include <basetsd.h>
-# endif
-typedef unsigned __int64 uint_ptr;
-#else
-typedef unsigned long uint_ptr;
-#endif
+#define AUD_ALIGN(a) (a + 16 - ((long)a & 15))
-#define AUD_ALIGN(a) (a + 16 - ((uint_ptr)a & 15))
-
AUD_Buffer::AUD_Buffer(int size)
{
m_size = size;
Modified: branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometrymodel.cpp
===================================================================
--- branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometrymodel.cpp 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/intern/elbeem/intern/ntl_geometrymodel.cpp 2012-04-24 16:36:34 UTC (rev 45936)
@@ -21,14 +21,7 @@
#endif
#endif // WIN32
-#if defined(_WIN64)
-# ifdef __MINGW64__
-# include <basetsd.h>
-# endif
-typedef __int64 int_ptr;
-#else
-typedef long int_ptr;
-#endif
+
/******************************************************************************
* Default Constructor
*****************************************************************************/
@@ -171,7 +164,7 @@
}
//fprintf(stderr,"initModel DEBUG %d \n",channelSize);
- debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(int_ptr)(channelVertices) ,10);
+ debMsgStd("ntlGeometryObjModel::initModel",DM_MSG, "Csize:"<<channelSize<<", Cvert:"<<(long)(channelVertices) ,10);
if(channelVertices && (channelSize>0)) {
vector<ntlSetVec3f> aniverts;
vector<ntlSetVec3f> aninorms;
Modified: branches/soc-2011-tomato/source/blender/editors/object/object_group.c
===================================================================
--- branches/soc-2011-tomato/source/blender/editors/object/object_group.c 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/source/blender/editors/object/object_group.c 2012-04-24 16:36:34 UTC (rev 45936)
@@ -65,7 +65,7 @@
Scene *scene= CTX_data_scene(C);
Object *ob= OBACT;
Group *group;
- int ok = 0;
+ int ok = 0, cycle = 0;
if (!ob) return OPERATOR_CANCELLED;
@@ -76,7 +76,10 @@
if (object_in_group(ob, group)) {
/* Assign groups to selected objects */
CTX_DATA_BEGIN(C, Base*, base, selected_editable_bases) {
- add_to_group(group, base->object, scene, base);
+ if (base->object->dup_group != group)
+ add_to_group(group, base->object, scene, base);
+ else
+ cycle = 1;
ok = 1;
}
CTX_DATA_END;
@@ -84,6 +87,8 @@
}
if (!ok) BKE_report(op->reports, RPT_ERROR, "Active Object contains no groups");
+ if (cycle)
+ BKE_report(op->reports, RPT_WARNING, "Skipped some groups because of cycle detected");
DAG_scene_sort(bmain, scene);
WM_event_add_notifier(C, NC_GROUP|NA_EDITED, NULL);
Property changes on: branches/soc-2011-tomato/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-45927
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:36831-45935
Modified: branches/soc-2011-tomato/source/gameengine/Expressions/KX_HashedPtr.cpp
===================================================================
--- branches/soc-2011-tomato/source/gameengine/Expressions/KX_HashedPtr.cpp 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/source/gameengine/Expressions/KX_HashedPtr.cpp 2012-04-24 16:36:34 UTC (rev 45936)
@@ -28,15 +28,13 @@
/** \file gameengine/Expressions/KX_HashedPtr.cpp
* \ingroup expressions
*/
-#ifdef __MINGW64__
-#include <basetsd.h>
-#endif
+
#include "KX_HashedPtr.h"
unsigned int KX_Hash(void * inDWord)
{
-#ifdef _WIN64
+#if defined(_WIN64) && !defined(FREE_WINDOWS64)
unsigned __int64 key = (unsigned __int64)inDWord;
#else
unsigned long key = (unsigned long)inDWord;
Modified: branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.cpp 2012-04-24 16:36:34 UTC (rev 45936)
@@ -31,10 +31,7 @@
*/
-#if defined(_WIN64)
-# ifdef __MINGW64__
-# include <basetsd.h>
-# endif
+#if defined(_WIN64) && !defined(FREE_WINDOWS64)
typedef unsigned __int64 uint_ptr;
#else
typedef unsigned long uint_ptr;
Modified: branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPO_SGController.cpp
===================================================================
--- branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPO_SGController.cpp 2012-04-24 16:35:20 UTC (rev 45935)
+++ branches/soc-2011-tomato/source/gameengine/Ketsji/KX_IPO_SGController.cpp 2012-04-24 16:36:34 UTC (rev 45936)
@@ -31,10 +31,7 @@
*/
-#if defined(_WIN64)
-# ifdef __MINGW64__
-# include <basetsd.h>
-# endif
+#if defined(_WIN64) && !defined(FREE_WINDOWS64)
typedef unsigned __int64 uint_ptr;
#else
typedef unsigned long uint_ptr;
More information about the Bf-blender-cvs
mailing list