[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40488] branches/bmesh/blender: svn merge ^/trunk/blender -r40395:40405
Campbell Barton
ideasman42 at gmail.com
Fri Sep 23 12:58:21 CEST 2011
Revision: 40488
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40488
Author: campbellbarton
Date: 2011-09-23 10:58:20 +0000 (Fri, 23 Sep 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40395:40405
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40395
Modified Paths:
--------------
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt
branches/bmesh/blender/extern/recastnavigation/SConscript
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/BKE_navmesh_conversion.h
branches/bmesh/blender/source/blender/blenkernel/CMakeLists.txt
branches/bmesh/blender/source/blender/blenkernel/SConscript
branches/bmesh/blender/source/blender/blenlib/intern/fileops.c
branches/bmesh/blender/source/blender/modifiers/CMakeLists.txt
branches/bmesh/blender/source/blender/modifiers/SConscript
branches/bmesh/blender/source/blender/python/generic/blf_py_api.c
branches/bmesh/blender/source/blender/python/intern/bpy.h
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_interface_atexit.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
branches/bmesh/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/bmesh/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
Added Paths:
-----------
branches/bmesh/blender/extern/recastnavigation/recast-capi.cpp
branches/bmesh/blender/extern/recastnavigation/recast-capi.h
branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.c
branches/bmesh/blender/source/blender/modifiers/intern/MOD_navmesh.c
Removed Paths:
-------------
branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.cpp
branches/bmesh/blender/source/blender/modifiers/intern/MOD_navmesh.cpp
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/po/messages.txt
branches/bmesh/blender/po/update_mo.py
branches/bmesh/blender/po/update_po.py
branches/bmesh/blender/po/update_pot.py
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/blenfont/BLF_translation.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_translation.c
branches/bmesh/blender/source/blender/editors/space_outliner/
branches/bmesh/blender/source/blender/python/intern/bpy_interface_atexit.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-40395
+ /trunk/blender:39992-40405
Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-09-23 10:43:25 UTC (rev 40487)
+++ branches/bmesh/blender/SConstruct 2011-09-23 10:58:20 UTC (rev 40488)
@@ -522,11 +522,13 @@
dn.remove('_svn')
for f in df:
+ # This files aren't used anymore
+ if f in ['.Blanguages', '.bfont.ttf']:
+ continue
+
if not env['WITH_BF_INTERNATIONAL']:
if 'locale' in dp:
continue
- if f == '.Blanguages':
- continue
if not env['WITH_BF_FREETYPE']:
if f.endswith('.ttf'):
continue
Modified: branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-09-23 10:43:25 UTC (rev 40487)
+++ branches/bmesh/blender/build_files/scons/config/win64-vc-config.py 2011-09-23 10:58:20 UTC (rev 40488)
@@ -96,7 +96,7 @@
BF_ZLIB_LIB = 'libz'
BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
-WITH_BF_INTERNATIONAL = False
+WITH_BF_INTERNATIONAL = True
BF_GETTEXT = LIBDIR + '/gettext'
BF_GETTEXT_INC = '${BF_GETTEXT}/include'
Modified: branches/bmesh/blender/build_files/scons/tools/Blender.py
===================================================================
--- branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-09-23 10:43:25 UTC (rev 40487)
+++ branches/bmesh/blender/build_files/scons/tools/Blender.py 2011-09-23 10:58:20 UTC (rev 40488)
@@ -564,12 +564,12 @@
# print cmd
commands.getoutput(cmd)
cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
- shutil.copy(bldroot + '/release/bin/.blender/.bfont.ttf', cmd)
- shutil.copy(bldroot + '/release/bin/.blender/.Blanguages', cmd)
- cmd = 'cp -R %s/release/bin/%s/locale %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
+ cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/bin/%s/locale %s/%s.app/Contents/MacOS/%s/'%(bldroot,VERSION,installdir,binary,VERSION)
+ cmd = 'cp -R %s/release/bin/.blender/locale %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
+ cmd = 'cp -R %s/release/bin/.blender/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+ commands.getoutput(cmd)
cmd = 'cp %s/release/bin/%s/.Blanguages %s/%s.app/Contents/Resources/'%(bldroot,VERSION,installdir,binary)
commands.getoutput(cmd)
if env['WITH_OSX_STATICPYTHON']:
@@ -581,10 +581,6 @@
if binary == 'blender':#not copy everything for blenderplayer
cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
- cmd = 'cp -R %s/release/ui %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
- commands.getoutput(cmd)
- cmd = 'cp -R %s/release/io %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
- commands.getoutput(cmd)
cmd = 'chmod +x %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
commands.getoutput(cmd)
Modified: branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt 2011-09-23 10:43:25 UTC (rev 40487)
+++ branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt 2011-09-23 10:58:20 UTC (rev 40488)
@@ -25,7 +25,7 @@
# ***** END GPL LICENSE BLOCK *****
set(INC
- Recast/Include
+ Recast/Include
Detour/Include
)
@@ -34,6 +34,10 @@
)
set(SRC
+ recast-capi.cpp
+ recast-capi.h
+
+
Detour/Source/DetourCommon.cpp
Detour/Source/DetourNode.cpp
Detour/Source/DetourStatNavMesh.cpp
@@ -47,7 +51,7 @@
Detour/Include/DetourStatNavMeshBuilder.h
Detour/Include/DetourTileNavMesh.h
Detour/Include/DetourTileNavMeshBuilder.h
-
+
Recast/Source/Recast.cpp
Recast/Source/RecastContour.cpp
Recast/Source/RecastFilter.cpp
@@ -57,10 +61,10 @@
Recast/Source/RecastRasterization.cpp
Recast/Source/RecastRegion.cpp
Recast/Source/RecastTimer.cpp
-
+
Recast/Include/Recast.h
Recast/Include/RecastLog.h
- Recast/Include/RecastTimer.h
+ Recast/Include/RecastTimer.h
)
blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")
Modified: branches/bmesh/blender/extern/recastnavigation/SConscript
===================================================================
--- branches/bmesh/blender/extern/recastnavigation/SConscript 2011-09-23 10:43:25 UTC (rev 40487)
+++ branches/bmesh/blender/extern/recastnavigation/SConscript 2011-09-23 10:58:20 UTC (rev 40488)
@@ -3,6 +3,7 @@
Import('env')
sources = env.Glob('Recast/Source/*.cpp') + env.Glob('Detour/Source/*.cpp')
+sources += ['recast-capi.cpp']
incs = 'Recast/Include Detour/Include'
Copied: branches/bmesh/blender/extern/recastnavigation/recast-capi.cpp (from rev 40405, trunk/blender/extern/recastnavigation/recast-capi.cpp)
===================================================================
--- branches/bmesh/blender/extern/recastnavigation/recast-capi.cpp (rev 0)
+++ branches/bmesh/blender/extern/recastnavigation/recast-capi.cpp 2011-09-23 10:58:20 UTC (rev 40488)
@@ -0,0 +1,37 @@
+/*
+ * $Id$
+ *
+ * ***** 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) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include "recast-capi.h"
+
+#include <math.h>
+#include "Recast.h"
+
+int recast_buildMeshAdjacency(unsigned short* polys, const int npolys,
+ const int nverts, const int vertsPerPoly)
+{
+ return (int) buildMeshAdjacency(polys, npolys, nverts, vertsPerPoly);
+}
Copied: branches/bmesh/blender/extern/recastnavigation/recast-capi.h (from rev 40405, trunk/blender/extern/recastnavigation/recast-capi.h)
===================================================================
--- branches/bmesh/blender/extern/recastnavigation/recast-capi.h (rev 0)
+++ branches/bmesh/blender/extern/recastnavigation/recast-capi.h 2011-09-23 10:58:20 UTC (rev 40488)
@@ -0,0 +1,42 @@
+/*
+ * $Id$
+ *
+ * ***** 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) 2011 Blender Foundation.
+ * All rights reserved.
+ *
+ * Contributor(s): Sergey Sharybin
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#ifndef RECAST_C_API_H
+#define RECAST_C_API_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+int recast_buildMeshAdjacency(unsigned short* polys, const int npolys,
+ const int nverts, const int vertsPerPoly);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // RECAST_C_API_H
Property changes on: branches/bmesh/blender/po/messages.txt
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Property changes on: branches/bmesh/blender/po/update_mo.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: branches/bmesh/blender/po/update_po.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: branches/bmesh/blender/po/update_pot.py
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-40395
+ /trunk/blender/release:31524-40405
Property changes on: branches/bmesh/blender/source/blender/blenfont/BLF_translation.h
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: branches/bmesh/blender/source/blender/blenfont/intern/blf_translation.c
___________________________________________________________________
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list