[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40632] branches/soc-2011-cucumber: svn merge 40546-40630(HEAD) + fix wm.py

Dalai Felinto dfelinto at gmail.com
Tue Sep 27 21:43:49 CEST 2011


Revision: 40632
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40632
Author:   dfelinto
Date:     2011-09-27 19:43:49 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
svn merge 40546-40630(HEAD) + fix wm.py
(moving import os inside the operator to be more trunk-like)

Modified Paths:
--------------
    branches/soc-2011-cucumber/CMakeLists.txt
    branches/soc-2011-cucumber/build_files/cmake/cmake_static_check_cppcheck.py
    branches/soc-2011-cucumber/build_files/cmake/macros.cmake
    branches/soc-2011-cucumber/build_files/cmake/project_source_info.py
    branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
    branches/soc-2011-cucumber/doc/python_api/rst/change_log.rst
    branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.cpp
    branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.h
    branches/soc-2011-cucumber/intern/audaspace/Python/AUD_PyAPI.cpp
    branches/soc-2011-cucumber/intern/elbeem/intern/solver_relax.h
    branches/soc-2011-cucumber/intern/ghost/CMakeLists.txt
    branches/soc-2011-cucumber/intern/ghost/SConscript
    branches/soc-2011-cucumber/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-cucumber/po/fr.po
    branches/soc-2011-cucumber/po/ja.po
    branches/soc-2011-cucumber/po/update_msg.py
    branches/soc-2011-cucumber/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/soc-2011-cucumber/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/__init__.py
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/anim_utils.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/console.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/view3d.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-cucumber/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-cucumber/source/blender/blenfont/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenfont/SConscript
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-cucumber/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-cucumber/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/BME_conversions.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/BME_structure.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/BME_tools.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/action.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/ipo.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/key.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/material.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/node.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sca.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-cucumber/source/blender/blenkernel/intern/writeframeserver.c
    branches/soc-2011-cucumber/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2011-cucumber/source/blender/blenlib/intern/storage.c
    branches/soc-2011-cucumber/source/blender/blenlib/intern/winstuff.c
    branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-cucumber/source/blender/editors/armature/poselib.c
    branches/soc-2011-cucumber/source/blender/editors/armature/reeb.c
    branches/soc-2011-cucumber/source/blender/editors/include/UI_interface.h
    branches/soc-2011-cucumber/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/editors/interface/SConscript
    branches/soc-2011-cucumber/source/blender/editors/interface/interface.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_anim.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_style.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-cucumber/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-cucumber/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/editors/mesh/SConscript
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_intern.h
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2011-cucumber/source/blender/editors/object/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/editors/object/SConscript
    branches/soc-2011-cucumber/source/blender/editors/object/object_intern.h
    branches/soc-2011-cucumber/source/blender/editors/object/object_ops.c
    branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-cucumber/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-cucumber/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-cucumber/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-cucumber/source/blender/editors/space_text/text_python.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform.c
    branches/soc-2011-cucumber/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-cucumber/source/blender/editors/util/editmode_undo.c
    branches/soc-2011-cucumber/source/blender/editors/util/undo.c
    branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-cucumber/source/blender/makesrna/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/makesrna/intern/SConscript
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_armature.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_cast.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_curve.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_displace.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_hook.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_lattice.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_smooth.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_warp.c
    branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_wave.c
    branches/soc-2011-cucumber/source/blender/nodes/intern/node_common.c
    branches/soc-2011-cucumber/source/blender/python/SConscript
    branches/soc-2011-cucumber/source/blender/python/generic/IDProp.c
    branches/soc-2011-cucumber/source/blender/python/generic/bgl.c
    branches/soc-2011-cucumber/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-cucumber/source/blender/python/generic/py_capi_utils.c
    branches/soc-2011-cucumber/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_app_handlers.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna_array.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-cucumber/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-cucumber/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2011-cucumber/source/blender/windowmanager/SConscript
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-cucumber/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-cucumber/source/creator/CMakeLists.txt
    branches/soc-2011-cucumber/source/creator/creator.c
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-cucumber/source/gameengine/GamePlayer/ghost/SConscript

Added Paths:
-----------
    branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/keyconfig_utils.py
    branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_navmesh.c

Removed Paths:
-------------
    branches/soc-2011-cucumber/source/blender/editors/object/object_navmesh.cpp

Property Changed:
----------------
    branches/soc-2011-cucumber/source/blender/editors/space_outliner/

Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/CMakeLists.txt	2011-09-27 19:43:49 UTC (rev 40632)
@@ -1153,14 +1153,19 @@
 
 
 # set the endian define
-include(TestBigEndian)
-test_big_endian(_SYSTEM_BIG_ENDIAN)
-if(_SYSTEM_BIG_ENDIAN)
-	add_definitions(-D__BIG_ENDIAN__)
+if(MSVC)
+	# for some reason this fails on msvc
+	add_definitions(-D__LITTLE_ENDIAN__)
 else()
-	add_definitions(-D__LITTLE_ENDIAN__)
+	include(TestBigEndian)
+	test_big_endian(_SYSTEM_BIG_ENDIAN)
+	if(_SYSTEM_BIG_ENDIAN)
+		add_definitions(-D__BIG_ENDIAN__)
+	else()
+		add_definitions(-D__LITTLE_ENDIAN__)
+	endif()
+	unset(_SYSTEM_BIG_ENDIAN)
 endif()
-unset(_SYSTEM_BIG_ENDIAN)
 
 
 if(WITH_IMAGE_OPENJPEG)
@@ -1269,7 +1274,10 @@
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_POINTER_ARITH -Wpointer-arith)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNUSED_PARAMETER -Wunused-parameter)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_WRITE_STRINGS -Wwrite-strings)
-	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
+
+	# # this causes too many warnings, disable
+	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_UNDEFINED -Wundef)
+
 	# disable because it gives warnings for printf() & friends.
 	# ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_DOUBLE_PROMOTION -Wdouble-promotion -Wno-error=double-promotion)
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_NO_ERROR_UNUSED_BUT_SET_VARIABLE -Wno-error=unused-but-set-variable)
@@ -1277,8 +1285,10 @@
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_ALL -Wall)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_INVALID_OFFSETOF -Wno-invalid-offsetof)
 	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_NO_SIGN_COMPARE -Wno-sign-compare)
-	ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
 
+	# # this causes too many warnings, disable
+	# ADD_CHECK_CXX_COMPILER_FLAG(CXX_WARNINGS CXX_WARN_UNDEFINED -Wundef)
+
 elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
 
 	ADD_CHECK_C_COMPILER_FLAG(C_WARNINGS C_WARN_ALL -Wall)

Modified: branches/soc-2011-cucumber/build_files/cmake/cmake_static_check_cppcheck.py
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/cmake_static_check_cppcheck.py	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/build_files/cmake/cmake_static_check_cppcheck.py	2011-09-27 19:43:49 UTC (rev 40632)
@@ -58,8 +58,8 @@
 
         check_commands.append((c, cmd))
 
+    process_functions = []
 
-    process_functions = []
     def my_process(i, c, cmd):
         percent = 100.0 * (i / (len(check_commands) - 1))
         percent_str = "[" + ("%.2f]" % percent).rjust(7) + " %:"

Modified: branches/soc-2011-cucumber/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/macros.cmake	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/build_files/cmake/macros.cmake	2011-09-27 19:43:49 UTC (rev 40632)
@@ -482,7 +482,7 @@
 	if(${_out_version_char_empty})
 		set(BLENDER_VERSION_CHAR_INDEX "0")
 	else()
-		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w q y z)
+		set(_char_ls a b c d e f g h i j k l m n o p q r s t u v w x y z)
 		list(FIND _char_ls ${BLENDER_VERSION_CHAR} _out_version_char_index)
 		math(EXPR BLENDER_VERSION_CHAR_INDEX "${_out_version_char_index} + 1")
 		unset(_char_ls)

Modified: branches/soc-2011-cucumber/build_files/cmake/project_source_info.py
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/project_source_info.py	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/build_files/cmake/project_source_info.py	2011-09-27 19:43:49 UTC (rev 40632)
@@ -161,8 +161,6 @@
         del multiprocessing
 
     if job_total == 1:
-        import os
-        import sys
         for func, args in process_funcs:
             sys.stdout.flush()
             sys.stderr.flush()
@@ -171,14 +169,13 @@
             process.wait()
     else:
         import time
-        import subprocess
 
         processes = []
         for func, args in process_funcs:
             # wait until a thread is free
             while 1:
                 processes[:] = [p for p in processes if p.poll() is None]
-     
+
                 if len(processes) <= job_total:
                     break
                 else:

Modified: branches/soc-2011-cucumber/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-cucumber/build_files/scons/tools/Blender.py	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/build_files/scons/tools/Blender.py	2011-09-27 19:43:49 UTC (rev 40632)
@@ -561,25 +561,26 @@
     cmd = 'cp %s/%s %s/%s.app/Contents/MacOS/%s'%(builddir, binary,installdir, binary, binary)
     commands.getoutput(cmd)
     cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/'%(installdir, binary, VERSION)
-#    print cmd
     commands.getoutput(cmd)
     cmd = installdir + '/%s.app/Contents/MacOS/%s'%(binary,VERSION)
-    cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION)
-    commands.getoutput(cmd)
-    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)
+
+    # blenderplayer doesn't need all the files
+    if binary == 'blender':
+        cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/datafiles'%(installdir, binary, VERSION)
+        commands.getoutput(cmd)
+        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)
+        cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
+        commands.getoutput(cmd)
+
     if env['WITH_OSX_STATICPYTHON']:
         cmd = 'mkdir %s/%s.app/Contents/MacOS/%s/python/'%(installdir,binary, VERSION)
         commands.getoutput(cmd)
         cmd = 'unzip -q %s/release/%s -d %s/%s.app/Contents/MacOS/%s/python/'%(libdir,python_zip,installdir,binary,VERSION)
-        commands.getoutput(cmd) 
-
-    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 = 'chmod +x  %s/%s.app/Contents/MacOS/%s'%(installdir,binary, binary)
@@ -695,7 +696,7 @@
         SConsEnvironment.Default(self, res)
         resources.append(res)
 
-    def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None):
+    def BlenderLib(self=None, libname=None, sources=None, includes=[], defines=[], libtype='common', priority = 100, compileflags=None, cc_compileflags=None, cxx_compileflags=None, cc_compilerchange=None, cxx_compilerchange=None):
         global vcp
         if not self or not libname or not sources:
             print bc.FAIL+'Cannot continue. Missing argument for BuildBlenderLib '+libname+bc.ENDC
@@ -733,6 +734,10 @@
                 lenv.Replace(CCFLAGS = cc_compileflags)
             if cxx_compileflags:
                 lenv.Replace(CXXFLAGS = cxx_compileflags)
+            if cc_compilerchange:
+                lenv.Replace(CC = cc_compilerchange)
+            if cxx_compilerchange:
+                lenv.Replace(CXX = cxx_compilerchange)
             lenv.Append(CFLAGS = lenv['C_WARN'])
             lenv.Append(CCFLAGS = lenv['CC_WARN'])
             lenv.Append(CXXFLAGS = lenv['CXX_WARN'])

Modified: branches/soc-2011-cucumber/doc/python_api/rst/change_log.rst
===================================================================
--- branches/soc-2011-cucumber/doc/python_api/rst/change_log.rst	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/doc/python_api/rst/change_log.rst	2011-09-27 19:43:49 UTC (rev 40632)
@@ -1396,7 +1396,7 @@
 * **hide** -> :class:`bpy.types.Material.game_settings.invisible`
 * **use_collision** -> :class:`bpy.types.Material.game_settings.physics`
 * **use_light** -> :class:`bpy.types.Material.game_settings.use_shadeless`
-* **use_twoside** -> :class:`bpy.types.Material.game_settings.back_culling`
+* **use_twoside** -> :class:`bpy.types.Material.game_settings.backface_culling`
 * **use_bitmap_text** -> :class:`bpy.types.Material.game_settings.text`
 * **blend_type** -> :class:`bpy.types.Material.game_settings.alpha_blend`
 * **use_alpha_sort** -> :class:`bpy.types.Material.game_settings.alpha_blend`

Modified: branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.cpp
===================================================================
--- branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.cpp	2011-09-27 19:35:41 UTC (rev 40631)
+++ branches/soc-2011-cucumber/extern/recastnavigation/recast-capi.cpp	2011-09-27 19:43:49 UTC (rev 40632)
@@ -35,3 +35,218 @@
 {
 	return (int) buildMeshAdjacency(polys, npolys, nverts, vertsPerPoly);
 }
+
+void recast_calcBounds(const float *verts, int nv, float *bmin, float *bmax)
+{
+	rcCalcBounds(verts, nv, bmin, bmax);
+}
+
+void recast_calcGridSize(const float *bmin, const float *bmax, float cs, int *w, int *h)
+{
+	rcCalcGridSize(bmin, bmax, cs, w, h);
+}
+
+struct recast_heightfield *recast_newHeightfield(void)
+{
+	return (struct recast_heightfield *) (new rcHeightfield);
+}
+
+void recast_destroyHeightfield(struct recast_heightfield *heightfield)
+{
+	delete (rcHeightfield *) heightfield;
+}
+
+int recast_createHeightfield(struct recast_heightfield *hf, int width, int height,

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list