[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [56536] branches/soc-2011-tomato: Merging r56518 through r56535 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed May 8 09:15:06 CEST 2013
Revision: 56536
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56536
Author: nazgul
Date: 2013-05-08 07:15:06 +0000 (Wed, 08 May 2013)
Log Message:
-----------
Merging r56518 through r56535 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56535
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py
branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-x86_64.py
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.cpp
branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackLibrary.cpp
branches/soc-2011-tomato/release/datafiles/splash.png
branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_group.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_relationships.c
branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_keymap.h
branches/soc-2011-tomato/source/tools/tag_release.py
Property Changed:
----------------
branches/soc-2011-tomato/
branches/soc-2011-tomato/source/blender/editors/interface/interface.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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-56517
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/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-56535
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-i386.py 2013-05-08 07:15:06 UTC (rev 56536)
@@ -317,6 +317,9 @@
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+#Freestyle
+WITH_BF_FREESTYLE = True
+
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-x86_64.py
===================================================================
--- branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-x86_64.py 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/build_files/buildbot/config/user-config-mac-x86_64.py 2013-05-08 07:15:06 UTC (rev 56536)
@@ -317,6 +317,9 @@
BF_CYCLES_CUDA_NVCC = '/usr/local/cuda/bin/nvcc'
BF_CYCLES_CUDA_BINARIES_ARCH = ['sm_20', 'sm_21', 'sm_30']
+#Freestyle
+WITH_BF_FREESTYLE = True
+
#Ray trace optimization
if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'i386':
WITH_BF_RAYOPTIMIZATION = True
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexHullShape.cpp 2013-05-08 07:15:06 UTC (rev 56536)
@@ -13,9 +13,9 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
#include "btConvexHullShape.h"
#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btConvexShape.cpp 2013-05-08 07:15:06 UTC (rev 56536)
@@ -13,9 +13,9 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
#include "btConvexShape.h"
#include "btTriangleShape.h"
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btMultiSphereShape.cpp 2013-05-08 07:15:06 UTC (rev 56536)
@@ -13,9 +13,9 @@
3. This notice may not be removed or altered from any source distribution.
*/
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
#include "btMultiSphereShape.h"
#include "BulletCollision/CollisionShapes/btCollisionMargin.h"
Modified: branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/CollisionShapes/btPolyhedralConvexShape.cpp 2013-05-08 07:15:06 UTC (rev 56536)
@@ -12,9 +12,9 @@
2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
#include "BulletCollision/CollisionShapes/btPolyhedralConvexShape.h"
#include "btConvexPolyhedron.h"
Modified: branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.cpp
===================================================================
--- branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.cpp 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/extern/bullet2/src/LinearMath/btVector3.cpp 2013-05-08 07:15:06 UTC (rev 56536)
@@ -15,9 +15,9 @@
This source version has been altered.
*/
-#if defined (_WIN32) || defined (__i386__)
-#define BT_USE_SSE_IN_API
-#endif
+//#if defined (_WIN32) || defined (__i386__)
+//#define BT_USE_SSE_IN_API
+//#endif
#include "btVector3.h"
Modified: branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackLibrary.cpp
===================================================================
--- branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackLibrary.cpp 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/intern/audaspace/jack/AUD_JackLibrary.cpp 2013-05-08 07:15:06 UTC (rev 56536)
@@ -47,7 +47,6 @@
jack_handle = dlopen("libjack.so", RTLD_LAZY);
if (!jack_handle) {
- fprintf(stderr, "%s\n", dlerror());
return;
}
Modified: branches/soc-2011-tomato/release/datafiles/splash.png
===================================================================
(Binary files differ)
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h 2013-05-08 07:15:06 UTC (rev 56536)
@@ -41,8 +41,8 @@
/* these lines are grep'd, watch out for our not-so-awesome regex
* and keep comment above the defines.
* Use STRINGIFY() rather than defining with quotes */
-#define BLENDER_VERSION 266
-#define BLENDER_SUBVERSION 6
+#define BLENDER_VERSION 267
+#define BLENDER_SUBVERSION 0
/* 262 was the last editmesh release but it has compatibility code for bmesh data */
#define BLENDER_MINVERSION 262
@@ -50,9 +50,9 @@
/* used by packaging tools */
/* can be left blank, otherwise a,b,c... etc with no quotes */
-#define BLENDER_VERSION_CHAR a
+#define BLENDER_VERSION_CHAR
/* alpha/beta/rc/release, docs use this */
-#define BLENDER_VERSION_CYCLE alpha
+#define BLENDER_VERSION_CYCLE release
extern char versionstr[]; /* from blender.c */
Modified: branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h 2013-05-08 07:15:06 UTC (rev 56536)
@@ -358,7 +358,7 @@
void ntreeMakeLocal(struct bNodeTree *ntree);
int ntreeHasType(struct bNodeTree *ntree, int type);
-void ntreeUpdateTree(struct bNodeTree *ntree);
+void ntreeUpdateTree(struct Main *main, struct bNodeTree *ntree);
/* XXX Currently each tree update call does call to ntreeVerifyNodes too.
* Some day this should be replaced by a decent depsgraph automatism!
*/
Modified: branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c 2013-05-08 07:15:06 UTC (rev 56536)
@@ -2848,7 +2848,7 @@
} FOREACH_NODETREE_END
}
-void ntreeUpdateTree(bNodeTree *ntree)
+void ntreeUpdateTree(Main *bmain, bNodeTree *ntree)
{
bNode *node;
@@ -2886,8 +2886,8 @@
ntreeInterfaceTypeUpdate(ntree);
/* XXX hack, should be done by depsgraph!! */
- if (G.main)
- ntreeVerifyNodes(G.main, &ntree->id);
+ if (bmain)
+ ntreeVerifyNodes(bmain, &ntree->id);
if (ntree->update & (NTREE_UPDATE_LINKS | NTREE_UPDATE_NODES)) {
/* node updates can change sockets or links, repeat link pointer update afterward */
Modified: branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2013-05-07 19:05:09 UTC (rev 56535)
+++ branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c 2013-05-08 07:15:06 UTC (rev 56536)
@@ -2579,7 +2579,7 @@
{
FOREACH_NODETREE(main, ntree, id) {
/* make an update call for the tree */
- ntreeUpdateTree(ntree);
+ ntreeUpdateTree(main, ntree);
} FOREACH_NODETREE_END
}
}
@@ -9346,7 +9346,7 @@
}
/* default values in Freestyle settings */
- {
+ if (main->versionfile < 267) {
Scene *sce;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list