[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40835] branches/bmesh/blender: svn merge ^/trunk/blender -r40644:40720

Campbell Barton ideasman42 at gmail.com
Thu Oct 6 18:59:59 CEST 2011


Revision: 40835
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40835
Author:   campbellbarton
Date:     2011-10-06 16:59:58 +0000 (Thu, 06 Oct 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r40644:40720

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

Modified Paths:
--------------
    branches/bmesh/blender/CMakeLists.txt
    branches/bmesh/blender/GNUmakefile
    branches/bmesh/blender/SConstruct
    branches/bmesh/blender/build_files/cmake/macros.cmake
    branches/bmesh/blender/build_files/scons/config/darwin-config.py
    branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
    branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt
    branches/bmesh/blender/extern/recastnavigation/Recast/Include/Recast.h
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/Recast.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastContour.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastFilter.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastMesh.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastRasterization.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastRegion.cpp
    branches/bmesh/blender/extern/recastnavigation/recast-capi.cpp
    branches/bmesh/blender/extern/recastnavigation/recast-capi.h
    branches/bmesh/blender/intern/audaspace/intern/AUD_SequencerReader.cpp
    branches/bmesh/blender/intern/elbeem/intern/ntl_world.cpp
    branches/bmesh/blender/intern/ghost/SConscript
    branches/bmesh/blender/po/POTFILES.in
    branches/bmesh/blender/po/ar.po
    branches/bmesh/blender/po/bg.po
    branches/bmesh/blender/po/ca.po
    branches/bmesh/blender/po/cs.po
    branches/bmesh/blender/po/de.po
    branches/bmesh/blender/po/el.po
    branches/bmesh/blender/po/es.po
    branches/bmesh/blender/po/fi.po
    branches/bmesh/blender/po/fr.po
    branches/bmesh/blender/po/hr.po
    branches/bmesh/blender/po/it.po
    branches/bmesh/blender/po/ja.po
    branches/bmesh/blender/po/ko.po
    branches/bmesh/blender/po/ne.po
    branches/bmesh/blender/po/nl.po
    branches/bmesh/blender/po/pl.po
    branches/bmesh/blender/po/pt_BR.po
    branches/bmesh/blender/po/ro.po
    branches/bmesh/blender/po/ru.po
    branches/bmesh/blender/po/sr.po
    branches/bmesh/blender/po/sr at Latn.po
    branches/bmesh/blender/po/sv.po
    branches/bmesh/blender/po/uk.po
    branches/bmesh/blender/po/update_mo.py
    branches/bmesh/blender/po/update_msg.py
    branches/bmesh/blender/po/update_po.py
    branches/bmesh/blender/po/update_pot.py
    branches/bmesh/blender/po/zh_CN.po
    branches/bmesh/blender/po/zh_TW.po
    branches/bmesh/blender/release/bin/.blender/fonts/droidsans.ttf.gz
    branches/bmesh/blender/release/bin/.blender/locale/ar/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/bg/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/ca/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/cs/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/de/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/el/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/es/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/fi/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/fr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/hr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/it/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/ja/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/ko/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/ne/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/nl/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/pl/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/pt_BR/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/ro/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/ru/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/sr/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/sr at Latn/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/sv/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/uk/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/zh_CN/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/bin/.blender/locale/zh_TW/LC_MESSAGES/blender.mo
    branches/bmesh/blender/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
    branches/bmesh/blender/release/scripts/startup/bl_ui/space_sequencer.py
    branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_fcurve.h
    branches/bmesh/blender/source/blender/blenkernel/BKE_object.h
    branches/bmesh/blender/source/blender/blenkernel/intern/cloth.c
    branches/bmesh/blender/source/blender/blenkernel/intern/collision.c
    branches/bmesh/blender/source/blender/blenkernel/intern/colortools.c
    branches/bmesh/blender/source/blender/blenkernel/intern/curve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/fcurve.c
    branches/bmesh/blender/source/blender/blenkernel/intern/implicit.c
    branches/bmesh/blender/source/blender/blenkernel/intern/multires.c
    branches/bmesh/blender/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/bmesh/blender/source/blender/blenkernel/intern/object.c
    branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
    branches/bmesh/blender/source/blender/blenkernel/intern/softbody.c
    branches/bmesh/blender/source/blender/blenkernel/intern/texture.c
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/editors/animation/anim_filter.c
    branches/bmesh/blender/source/blender/editors/animation/keyframes_edit.c
    branches/bmesh/blender/source/blender/editors/include/UI_interface.h
    branches/bmesh/blender/source/blender/editors/interface/interface.c
    branches/bmesh/blender/source/blender/editors/interface/interface_draw.c
    branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
    branches/bmesh/blender/source/blender/editors/interface/interface_icons.c
    branches/bmesh/blender/source/blender/editors/interface/interface_ops.c
    branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
    branches/bmesh/blender/source/blender/editors/mesh/mesh_navmesh.c
    branches/bmesh/blender/source/blender/editors/physics/physics_fluid.c
    branches/bmesh/blender/source/blender/editors/space_action/action_edit.c
    branches/bmesh/blender/source/blender/editors/space_graph/graph_buttons.c
    branches/bmesh/blender/source/blender/editors/space_outliner/space_outliner.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/bmesh/blender/source/blender/editors/space_sequencer/sequencer_select.c
    branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
    branches/bmesh/blender/source/blender/editors/space_view3d/view3d_buttons.c
    branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
    branches/bmesh/blender/source/blender/gpu/intern/gpu_material.c
    branches/bmesh/blender/source/blender/imbuf/intern/anim_movie.c
    branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
    branches/bmesh/blender/source/blender/makesdna/DNA_texture_types.h
    branches/bmesh/blender/source/blender/makesdna/DNA_windowmanager_types.h
    branches/bmesh/blender/source/blender/makesrna/intern/CMakeLists.txt
    branches/bmesh/blender/source/blender/makesrna/intern/makesrna.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_armature.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_boid.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_camera.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_internal.h
    branches/bmesh/blender/source/blender/makesrna/intern/rna_main_api.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_particle.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_screen.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_sequencer.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_texture.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_ui.c
    branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
    branches/bmesh/blender/source/blender/modifiers/intern/MOD_explode.c
    branches/bmesh/blender/source/blender/python/intern/bpy_props.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
    branches/bmesh/blender/source/blender/python/intern/bpy_rna.h
    branches/bmesh/blender/source/blender/quicktime/SConscript
    branches/bmesh/blender/source/blender/render/intern/include/render_types.h
    branches/bmesh/blender/source/blender/render/intern/source/render_texture.c
    branches/bmesh/blender/source/blender/render/intern/source/volume_precache.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_files.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_init_exit.c
    branches/bmesh/blender/source/blender/windowmanager/intern/wm_operators.c
    branches/bmesh/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
    branches/bmesh/blender/source/gameengine/Ketsji/KX_SteeringActuator.cpp

Added Paths:
-----------
    branches/bmesh/blender/extern/recastnavigation/Recast/Include/RecastAlloc.h
    branches/bmesh/blender/extern/recastnavigation/Recast/Include/RecastAssert.h
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastAlloc.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastArea.cpp
    branches/bmesh/blender/extern/recastnavigation/Recast/Source/RecastLayers.cpp
    branches/bmesh/blender/po/README.txt
    branches/bmesh/blender/po/check_po.py
    branches/bmesh/blender/po/clean_po.py
    branches/bmesh/blender/po/merge_po.py
    branches/bmesh/blender/source/blender/makesrna/intern/rna_camera_api.c

Removed Paths:
-------------
    branches/bmesh/blender/po/blender.pot
    branches/bmesh/blender/po/messages.txt

Property Changed:
----------------
    branches/bmesh/blender/
    branches/bmesh/blender/po/ne.po
    branches/bmesh/blender/release/
    branches/bmesh/blender/release/bin/.blender/fonts/droidsans.ttf.gz
    branches/bmesh/blender/source/blender/editors/space_outliner/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:39992-40643
   + /trunk/blender:39992-40720

Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/CMakeLists.txt	2011-10-06 16:59:58 UTC (rev 40835)
@@ -488,17 +488,17 @@
 		find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
 		mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
 
-		list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB})
+		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}")
 
 		if(WITH_X11_XINPUT)
-			list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB})
+			set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}")
 		endif()
 	endif()
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
 		if(NOT WITH_PYTHON_MODULE)
 			# BSD's dont use libdl.so
-			list(APPEND PLATFORM_LINKLIBS -ldl)
+		set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
 			# binreloc is linux only
 			set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
 			set(WITH_BINRELOC ON)

Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/GNUmakefile	2011-10-06 16:59:58 UTC (rev 40835)
@@ -164,7 +164,7 @@
 # Other Targets
 #
 translations:
-	$(BUILD_DIR)/bin/blender --background --python po/update_msg.py
+	$(BUILD_DIR)/bin/blender --background --factory-startup --python po/update_msg.py
 	python3 po/update_pot.py
 	python3 po/update_po.py
 	python3 po/update_mo.py

Modified: branches/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/SConstruct	2011-10-06 16:59:58 UTC (rev 40835)
@@ -277,7 +277,7 @@
             print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
             env['WITH_BF_3DMOUSE'] = 0
         else:
-            env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
+            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
 
 if env['WITH_BF_OPENMP'] == 1:
         if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):

Modified: branches/bmesh/blender/build_files/cmake/macros.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/macros.cmake	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/build_files/cmake/macros.cmake	2011-10-06 16:59:58 UTC (rev 40835)
@@ -213,6 +213,7 @@
 			${JPEG_LIBRARIES}
 			${PNG_LIBRARIES}
 			${ZLIB_LIBRARIES}
+			${FREETYPE_LIBRARY}
 			${PLATFORM_LINKLIBS})
 
 	# since we are using the local libs for python when compiling msvc projects, we need to add _d when compiling debug versions
@@ -233,13 +234,6 @@
 		target_link_libraries(${target} ${GLEW_LIBRARY})
 	endif()
 
-	target_link_libraries(${target}
-			${OPENGL_glu_LIBRARY}
-			${JPEG_LIBRARIES}
-			${PNG_LIBRARIES}
-			${ZLIB_LIBRARIES}
-			${FREETYPE_LIBRARY})
-
 	if(WITH_INTERNATIONAL)
 		target_link_libraries(${target} ${GETTEXT_LIB})
 

Modified: branches/bmesh/blender/build_files/scons/config/darwin-config.py
===================================================================
--- branches/bmesh/blender/build_files/scons/config/darwin-config.py	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/build_files/scons/config/darwin-config.py	2011-10-06 16:59:58 UTC (rev 40835)
@@ -90,9 +90,10 @@
 ###################          Dependency settings           ##################
 #############################################################################
 
-#Defaults openMP to true if compiler handles it
-if CC == 'gcc-4.2' or CC == 'llvm-gcc-4.2':
-    WITH_BF_OPENMP = True  # multithreading for fluids, cloth and smoke
+#Defaults openMP to true if compiler handles it ( only gcc 4.6.1 and newer )
+# if your compiler does not have accurate suffix you may have to enable it by hand !
+if CC.endswith('4.6.1'):
+    WITH_BF_OPENMP = True  # multithreading for fluids, cloth, sculpt and smoke
 else:
     WITH_BF_OPENMP = False
 

Modified: branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/doc/python_api/sphinx_doc_gen.py	2011-10-06 16:59:58 UTC (rev 40835)
@@ -161,7 +161,7 @@
 
 
 def example_extract_docstring(filepath):
-    file = open(filepath, 'r')
+    file = open(filepath, "r", encoding="utf-8")
     line = file.readline()
     line_no = 0
     text = []
@@ -360,7 +360,7 @@
     if module_all:
         module_dir = module_all
 
-    file = open(filepath, "w")
+    file = open(filepath, "w", encoding="utf-8")
 
     fw = file.write
 
@@ -510,7 +510,7 @@
     # Only use once. very irregular
 
     filepath = os.path.join(BASEPATH, "bpy.context.rst")
-    file = open(filepath, "w")
+    file = open(filepath, "w", encoding="utf-8")
     fw = file.write
     fw("Context Access (bpy.context)\n")
     fw("============================\n\n")
@@ -698,7 +698,7 @@
         #    return
 
         filepath = os.path.join(BASEPATH, "bpy.types.%s.rst" % struct.identifier)
-        file = open(filepath, "w")
+        file = open(filepath, "w", encoding="utf-8")
         fw = file.write
 
         base_id = getattr(struct.base, "identifier", "")
@@ -912,7 +912,7 @@
 
         def fake_bpy_type(class_value, class_name, descr_str, use_subclasses=True):
             filepath = os.path.join(BASEPATH, "bpy.types.%s.rst" % class_name)
-            file = open(filepath, "w")
+            file = open(filepath, "w", encoding="utf-8")
             fw = file.write
 
             write_title(fw, class_name, "=")
@@ -963,7 +963,7 @@
 
         for op_module_name, ops_mod in op_modules.items():
             filepath = os.path.join(BASEPATH, "bpy.ops.%s.rst" % op_module_name)
-            file = open(filepath, "w")
+            file = open(filepath, "w", encoding="utf-8")
             fw = file.write
 
             title = "%s Operators" % op_module_name.replace("_", " ").title()
@@ -1017,7 +1017,7 @@
 
     # conf.py - empty for now
     filepath = os.path.join(BASEPATH, "conf.py")
-    file = open(filepath, "w")
+    file = open(filepath, "w", encoding="utf-8")
     fw = file.write
 
     version_string = ".".join(str(v) for v in bpy.app.version)
@@ -1053,7 +1053,7 @@
 
     # main page needed for sphinx (index.html)
     filepath = os.path.join(BASEPATH, "contents.rst")
-    file = open(filepath, "w")
+    file = open(filepath, "w", encoding="utf-8")
     fw = file.write
 
     fw("%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n")
@@ -1169,7 +1169,7 @@
     # internal modules
     if "bpy.ops" not in EXCLUDE_MODULES:
         filepath = os.path.join(BASEPATH, "bpy.ops.rst")
-        file = open(filepath, "w")
+        file = open(filepath, "w", encoding="utf-8")
         fw = file.write
         fw("Operators (bpy.ops)\n")
         fw("===================\n\n")
@@ -1181,7 +1181,7 @@
 
     if "bpy.types" not in EXCLUDE_MODULES:
         filepath = os.path.join(BASEPATH, "bpy.types.rst")
-        file = open(filepath, "w")
+        file = open(filepath, "w", encoding="utf-8")
         fw = file.write
         fw("Types (bpy.types)\n")
         fw("=================\n\n")
@@ -1194,7 +1194,7 @@
         # not actually a module, only write this file so we
         # can reference in the TOC
         filepath = os.path.join(BASEPATH, "bpy.data.rst")
-        file = open(filepath, "w")
+        file = open(filepath, "w", encoding="utf-8")
         fw = file.write
         fw("Data Access (bpy.data)\n")
         fw("======================\n\n")
@@ -1284,7 +1284,7 @@
 
     if 0:
         filepath = os.path.join(BASEPATH, "bpy.rst")
-        file = open(filepath, "w")
+        file = open(filepath, "w", encoding="utf-8")
         fw = file.write
 
         fw("\n")

Modified: branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/extern/recastnavigation/CMakeLists.txt	2011-10-06 16:59:58 UTC (rev 40835)
@@ -53,18 +53,19 @@
 		Detour/Include/DetourTileNavMeshBuilder.h
 
 		Recast/Source/Recast.cpp
+		Recast/Source/RecastAlloc.cpp
+		Recast/Source/RecastArea.cpp
 		Recast/Source/RecastContour.cpp
 		Recast/Source/RecastFilter.cpp
-		Recast/Source/RecastLog.cpp
+		Recast/Source/RecastLayers.cpp
 		Recast/Source/RecastMesh.cpp
 		Recast/Source/RecastMeshDetail.cpp
 		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/RecastAlloc.h
+		Recast/Include/RecastAssert.h
 )
 
 blender_add_lib(extern_recastnavigation "${SRC}" "${INC}" "${INC_SYS}")

Modified: branches/bmesh/blender/extern/recastnavigation/Recast/Include/Recast.h
===================================================================
--- branches/bmesh/blender/extern/recastnavigation/Recast/Include/Recast.h	2011-10-06 16:29:04 UTC (rev 40834)
+++ branches/bmesh/blender/extern/recastnavigation/Recast/Include/Recast.h	2011-10-06 16:59:58 UTC (rev 40835)
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2009 Mikko Mononen memon at inside.org
+// Copyright (c) 2009-2010 Mikko Mononen memon at inside.org
 //
 // This software is provided 'as-is', without any express or implied
 // warranty.  In no event will the authors be held liable for any damages
@@ -19,298 +19,685 @@
 #ifndef RECAST_H
 #define RECAST_H
 
-// The units of the parameters are specified in parenthesis as follows:
-// (vx) voxels, (wu) world units
+/// The value of PI used by Recast.
+static const float RC_PI = 3.14159265f;
+
+/// Recast log categories.
+/// @see rcContext
+enum rcLogCategory
+{
+	RC_LOG_PROGRESS = 1,	///< A progress log entry.
+	RC_LOG_WARNING,	 	    ///< A warning log entry.
+	RC_LOG_ERROR,	   	    ///< An error log entry.
+};
+
+/// Recast performance timer categories.
+/// @see rcContext

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list