[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16425] branches/soc-2008-mxcurioni: soc-2008-mxcurioni: merged changes to revision 16424, corrected compilation errors
Maxime Curioni
maxime.curioni at gmail.com
Mon Sep 8 20:37:25 CEST 2008
Revision: 16425
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16425
Author: mxcurioni
Date: 2008-09-08 20:37:24 +0200 (Mon, 08 Sep 2008)
Log Message:
-----------
soc-2008-mxcurioni: merged changes to revision 16424, corrected compilation errors
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16424
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMake/macros.cmake
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/SConstruct
branches/soc-2008-mxcurioni/bin/.blender/.Blanguages
branches/soc-2008-mxcurioni/blenderplayer/CMakeLists.txt
branches/soc-2008-mxcurioni/config/linux2-config.py
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.h
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.cpp
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/NarrowPhaseCollision/btRaycastCallback.h
branches/soc-2008-mxcurioni/extern/bullet2/src/BulletDynamics/Dynamics/btDiscreteDynamicsWorld.cpp
branches/soc-2008-mxcurioni/extern/glew/SConscript
branches/soc-2008-mxcurioni/extern/glew/include/GL/glew.h
branches/soc-2008-mxcurioni/extern/glew/src/glew.c
branches/soc-2008-mxcurioni/intern/boolop/SConscript
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Edge.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Edge.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Face.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Interface.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Mesh.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Tag.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Vertex.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Vertex.h
branches/soc-2008-mxcurioni/intern/boolop/make/msvc_7_0/boolop.vcproj
branches/soc-2008-mxcurioni/intern/bsp/SConscript
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2008-mxcurioni/intern/guardedalloc/intern/mallocn.c
branches/soc-2008-mxcurioni/intern/guardedalloc/make/msvc_7_0/guardedalloc.vcproj
branches/soc-2008-mxcurioni/intern/memutil/MEM_Allocator.h
branches/soc-2008-mxcurioni/intern/memutil/MEM_CacheLimiter.h
branches/soc-2008-mxcurioni/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
branches/soc-2008-mxcurioni/intern/moto/include/GEN_Map.h
branches/soc-2008-mxcurioni/intern/moto/include/MT_Matrix4x4.h
branches/soc-2008-mxcurioni/intern/moto/include/MT_Matrix4x4.inl
branches/soc-2008-mxcurioni/intern/opennl/make/msvc_7_0/opennl.vcproj
branches/soc-2008-mxcurioni/intern/opennl/superlu/smemory.c
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/BPY_python/BPY_python.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/blender.sln
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/blender.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/blenkernel/BKE_blenkernel.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/nodes/nodes.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/radiosity/BRA_radiosity.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/src/BL_src.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/blenderhook/KX_blenderhook.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/converter/KX_converter.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/expression/EXP_expressions.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/gamelogic/SCA_GameLogic.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/ketsji/KX_ketsji.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Bullet/PHY_Bullet.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/physics/PHY_Physics/PHY_Sumo/PHY_Sumo.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/gameengine/rasterizer/openglrasterizer/RAS_openglrasterizer.vcproj
branches/soc-2008-mxcurioni/projectfiles_vc7/kernel/system/SYS_system.vcproj
branches/soc-2008-mxcurioni/release/VERSION
branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
branches/soc-2008-mxcurioni/release/datafiles/datatoc.c
branches/soc-2008-mxcurioni/release/datafiles/splash.jpg
branches/soc-2008-mxcurioni/release/scripts/bpymodules/colladaImEx/collada.py
branches/soc-2008-mxcurioni/release/scripts/bpymodules/colladaImEx/cstartup.py
branches/soc-2008-mxcurioni/release/scripts/bpymodules/colladaImEx/helperObjects.py
branches/soc-2008-mxcurioni/release/scripts/bpymodules/colladaImEx/translator.py
branches/soc-2008-mxcurioni/release/scripts/bpymodules/colladaImEx/xmlUtils.py
branches/soc-2008-mxcurioni/release/scripts/flt_export.py
branches/soc-2008-mxcurioni/release/scripts/flt_palettemanager.py
branches/soc-2008-mxcurioni/release/scripts/flt_properties.py
branches/soc-2008-mxcurioni/release/scripts/import_dxf.py
branches/soc-2008-mxcurioni/release/scripts/mesh_cleanup.py
branches/soc-2008-mxcurioni/release/scripts/object_find.py
branches/soc-2008-mxcurioni/release/scripts/ply_export.py
branches/soc-2008-mxcurioni/release/scripts/rvk1_torvk2.py
branches/soc-2008-mxcurioni/release/scripts/sysinfo.py
branches/soc-2008-mxcurioni/release/scripts/weightpaint_clean.py
branches/soc-2008-mxcurioni/release/text/copyright.txt
branches/soc-2008-mxcurioni/source/Makefile
branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/Makefile
branches/soc-2008-mxcurioni/source/blender/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_action.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bad_level_calls.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_colortools.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_customdata.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_deform.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_effect.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_endian.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_node.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_text.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_texture.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_utildefines.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
branches/soc-2008-mxcurioni/source/blender/blenkernel/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/cloth.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/collision.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/colortools.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/constraint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/customdata.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/deform.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/effect.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/icons.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idprop.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/image.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/implicit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sca.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/text.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/texture.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_arithb.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_blenlib.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_editVert.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_rand.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/arithb.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/fileops.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/freetypefont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/psfont.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/rand.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/util.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_sys_types.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/genfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/blenpluginapi/intern/pluginapi.c
branches/soc-2008-mxcurioni/source/blender/freestyle/SConscript
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/cineonlib.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/dpxlib.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logImageCore.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logmemfile.c
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/logmemfile.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/scaling.c
branches/soc-2008-mxcurioni/source/blender/include/BDR_drawmesh.h
branches/soc-2008-mxcurioni/source/blender/include/BDR_drawobject.h
branches/soc-2008-mxcurioni/source/blender/include/BDR_gpencil.h
branches/soc-2008-mxcurioni/source/blender/include/BDR_imagepaint.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_drawgpencil.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_drawseq.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_drawtext.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_editaction.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_editarmature.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_editmesh.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_editview.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_gl.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_keyval.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_meshtools.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_poseobject.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_resources.h
branches/soc-2008-mxcurioni/source/blender/include/BIF_space.h
branches/soc-2008-mxcurioni/source/blender/include/BSE_drawipo.h
branches/soc-2008-mxcurioni/source/blender/include/BSE_drawview.h
branches/soc-2008-mxcurioni/source/blender/include/blendef.h
branches/soc-2008-mxcurioni/source/blender/include/butspace.h
branches/soc-2008-mxcurioni/source/blender/include/transform.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_brush_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_customdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_gpencil_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_group_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_image_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_force.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_particle_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sensor_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_sequence_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_text_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_texture_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_world_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/nodes/SConscript
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/Makefile
branches/soc-2008-mxcurioni/source/blender/nodes/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/Makefile
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_camera.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_curves.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_geom.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_hueSatVal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_invert.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_mapping.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_material.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_math.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_normal.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_output.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_rgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_sepcombRGB.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_squeeze.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_texture.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_valToRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_value.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_vectMath.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_util.h
branches/soc-2008-mxcurioni/source/blender/python/BPY_extern.h
branches/soc-2008-mxcurioni/source/blender/python/BPY_interface.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_menus.c
branches/soc-2008-mxcurioni/source/blender/python/BPY_menus.h
branches/soc-2008-mxcurioni/source/blender/python/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/SConscript
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Armature.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Blender.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Bone.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Constraint.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Draw.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Group.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/IDProp.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Image.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Lamp.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/MTex.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Makefile
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Material.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Mathutils.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Mathutils.h
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Mesh.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Object.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Particle.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Text.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Text.h
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Text3d.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/Texture.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Armature.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Draw.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Group.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/IDProp.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Material.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Mathutils.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Mesh.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Object.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Render.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Text.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Text3d.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/doc/Texture.py
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/gen_utils.h
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/sceneRender.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/sceneSequence.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/vector.c
branches/soc-2008-mxcurioni/source/blender/python/api2_2x/vector.h
branches/soc-2008-mxcurioni/source/blender/radiosity/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/radiosity/SConscript
branches/soc-2008-mxcurioni/source/blender/radiosity/intern/source/Makefile
branches/soc-2008-mxcurioni/source/blender/radiosity/intern/source/radnode.c
branches/soc-2008-mxcurioni/source/blender/radiosity/intern/source/radpreprocess.c
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/SConscript
branches/soc-2008-mxcurioni/source/blender/render/intern/include/render_types.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/convertblender.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/occlusion.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rendercore.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadbuf.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/strand.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/src/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/src/Makefile
branches/soc-2008-mxcurioni/source/blender/src/SConscript
branches/soc-2008-mxcurioni/source/blender/src/blenderbuttons.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_editing.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_logic.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_object.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_scene.c
branches/soc-2008-mxcurioni/source/blender/src/buttons_shading.c
branches/soc-2008-mxcurioni/source/blender/src/drawaction.c
branches/soc-2008-mxcurioni/source/blender/src/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/src/drawgpencil.c
branches/soc-2008-mxcurioni/source/blender/src/drawimage.c
branches/soc-2008-mxcurioni/source/blender/src/drawipo.c
branches/soc-2008-mxcurioni/source/blender/src/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/src/drawnode.c
branches/soc-2008-mxcurioni/source/blender/src/drawobject.c
branches/soc-2008-mxcurioni/source/blender/src/drawseq.c
branches/soc-2008-mxcurioni/source/blender/src/drawtext.c
branches/soc-2008-mxcurioni/source/blender/src/drawview.c
branches/soc-2008-mxcurioni/source/blender/src/editaction.c
branches/soc-2008-mxcurioni/source/blender/src/editaction_gpencil.c
branches/soc-2008-mxcurioni/source/blender/src/editarmature.c
branches/soc-2008-mxcurioni/source/blender/src/editdeform.c
branches/soc-2008-mxcurioni/source/blender/src/editface.c
branches/soc-2008-mxcurioni/source/blender/src/editimasel.c
branches/soc-2008-mxcurioni/source/blender/src/editipo.c
branches/soc-2008-mxcurioni/source/blender/src/editipo_lib.c
branches/soc-2008-mxcurioni/source/blender/src/editkey.c
branches/soc-2008-mxcurioni/source/blender/src/editlattice.c
branches/soc-2008-mxcurioni/source/blender/src/editmesh.c
branches/soc-2008-mxcurioni/source/blender/src/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/src/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/src/editmode_undo.c
branches/soc-2008-mxcurioni/source/blender/src/editnode.c
branches/soc-2008-mxcurioni/source/blender/src/editobject.c
branches/soc-2008-mxcurioni/source/blender/src/editseq.c
branches/soc-2008-mxcurioni/source/blender/src/editsound.c
branches/soc-2008-mxcurioni/source/blender/src/editview.c
branches/soc-2008-mxcurioni/source/blender/src/gpencil.c
branches/soc-2008-mxcurioni/source/blender/src/header_action.c
branches/soc-2008-mxcurioni/source/blender/src/header_image.c
branches/soc-2008-mxcurioni/source/blender/src/header_info.c
branches/soc-2008-mxcurioni/source/blender/src/header_ipo.c
branches/soc-2008-mxcurioni/source/blender/src/header_node.c
branches/soc-2008-mxcurioni/source/blender/src/header_script.c
branches/soc-2008-mxcurioni/source/blender/src/header_text.c
branches/soc-2008-mxcurioni/source/blender/src/header_view3d.c
branches/soc-2008-mxcurioni/source/blender/src/headerbuttons.c
branches/soc-2008-mxcurioni/source/blender/src/imagepaint.c
branches/soc-2008-mxcurioni/source/blender/src/interface.c
branches/soc-2008-mxcurioni/source/blender/src/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/src/keyval.c
branches/soc-2008-mxcurioni/source/blender/src/meshlaplacian.c
branches/soc-2008-mxcurioni/source/blender/src/meshtools.c
branches/soc-2008-mxcurioni/source/blender/src/outliner.c
branches/soc-2008-mxcurioni/source/blender/src/parametrizer.c
branches/soc-2008-mxcurioni/source/blender/src/parametrizer.h
branches/soc-2008-mxcurioni/source/blender/src/parametrizer_intern.h
branches/soc-2008-mxcurioni/source/blender/src/playanim.c
branches/soc-2008-mxcurioni/source/blender/src/poselib.c
branches/soc-2008-mxcurioni/source/blender/src/poseobject.c
branches/soc-2008-mxcurioni/source/blender/src/previewrender.c
branches/soc-2008-mxcurioni/source/blender/src/renderwin.c
branches/soc-2008-mxcurioni/source/blender/src/resources.c
branches/soc-2008-mxcurioni/source/blender/src/sculptmode.c
branches/soc-2008-mxcurioni/source/blender/src/sequence.c
branches/soc-2008-mxcurioni/source/blender/src/space.c
branches/soc-2008-mxcurioni/source/blender/src/splash.jpg.c
branches/soc-2008-mxcurioni/source/blender/src/toets.c
branches/soc-2008-mxcurioni/source/blender/src/toolbox.c
branches/soc-2008-mxcurioni/source/blender/src/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/src/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/src/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/src/transform_numinput.c
branches/soc-2008-mxcurioni/source/blender/src/usiblender.c
branches/soc-2008-mxcurioni/source/blender/src/verse_image.c
branches/soc-2008-mxcurioni/source/blender/src/view.c
branches/soc-2008-mxcurioni/source/blender/yafray/intern/export_File.cpp
branches/soc-2008-mxcurioni/source/blender/yafray/intern/export_Plugin.cpp
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/Makefile
branches/soc-2008-mxcurioni/source/creator/SConscript
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/Makefile
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_DeformableGameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_MeshDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeActionActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinMeshObject.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/KX_IpoConvert.h
branches/soc-2008-mxcurioni/source/gameengine/Converter/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Converter/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Expressions/InputParser.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/ListValue.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/PyObjectPlus.h
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.cpp
branches/soc-2008-mxcurioni/source/gameengine/Expressions/Value.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_JoystickDefines.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Joystick/SCA_JoystickPrivate.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/Makefile
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ActuatorSensor.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_AlwaysEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_EventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_EventManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IController.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ILogicBrick.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_ISensor.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_JoystickSensor.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_LogicManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_MouseManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PropertyEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_PythonController.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_RandomEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_TimeEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_TimeEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/GPC_RenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/Makefile
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/unix/GPU_PolygonMaterial.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_Canvas.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/Makefile
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Material.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/BL_Texture.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/KX_NetworkEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_CameraActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConstraintWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IPO_SGController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_IpoActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Light.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MaterialIpoController.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MeshProxy.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_MouseFocusSensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_NearSensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ParentActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PyMath.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayCast.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayCast.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RayEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RaySensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SG_BoneParentNodeRelationship.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchEventManager.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchSensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TrackToActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VertexProxy.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VisibilityActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_VisibilityActuator.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/BlOde/OdePhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsController.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/Sumo/Fuzzics/src/SM_Scene.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Sumo/SumoPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameKeys.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/GameLogic.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_CameraActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_ConstraintActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_GameObject.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_IpoActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_MeshProxy.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_ObjectActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_ParentActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_SCA_AddObjectActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_SCA_ReplaceMeshActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_TrackToActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/Rasterizer.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/SCA_ISensor.py
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_BucketManager.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_CameraData.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_IRenderTools.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MaterialBucket.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/Makefile
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/SConscript
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Polygon.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_Polygon.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexVert.cpp
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_TexVert.h
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/SConscript
branches/soc-2008-mxcurioni/source/kernel/CMakeLists.txt
branches/soc-2008-mxcurioni/source/kernel/SConscript
branches/soc-2008-mxcurioni/source/kernel/gen_system/GEN_HashedPtr.cpp
branches/soc-2008-mxcurioni/source/kernel/gen_system/GEN_Map.h
branches/soc-2008-mxcurioni/source/kernel/gen_system/Makefile
branches/soc-2008-mxcurioni/source/nan_definitions.mk
branches/soc-2008-mxcurioni/tools/btools.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/bin/.blender/locale/kr/
branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES/
branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/soc-2008-mxcurioni/intern/bmfont/intern/BDF2BMF.py
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.cpp
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Merge2.h
branches/soc-2008-mxcurioni/intern/boolop/intern/BOP_Misc.h
branches/soc-2008-mxcurioni/intern/guardedalloc/BLO_sys_types.h
branches/soc-2008-mxcurioni/intern/opennl/superlu/BLO_sys_types.h
branches/soc-2008-mxcurioni/po/kr.po
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/gpu/
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
branches/soc-2008-mxcurioni/release/scripts/bpymodules/BPyTextPlugin.py
branches/soc-2008-mxcurioni/release/scripts/flt_dofedit.py
branches/soc-2008-mxcurioni/release/scripts/flt_lodedit.py
branches/soc-2008-mxcurioni/release/scripts/scripttemplate_text_plugin.py
branches/soc-2008-mxcurioni/release/scripts/textplugin_functiondocs.py
branches/soc-2008-mxcurioni/release/scripts/textplugin_imports.py
branches/soc-2008-mxcurioni/release/scripts/textplugin_membersuggest.py
branches/soc-2008-mxcurioni/release/scripts/textplugin_outliner.py
branches/soc-2008-mxcurioni/release/scripts/textplugin_suggest.py
branches/soc-2008-mxcurioni/release/scripts/textplugin_templates.py
branches/soc-2008-mxcurioni/release/text/release_247.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_bvhutils.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_shrinkwrap.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_suggestions.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bvhutils.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/suggestions.c
branches/soc-2008-mxcurioni/source/blender/gpu/
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_draw.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
branches/soc-2008-mxcurioni/source/blender/gpu/Makefile
branches/soc-2008-mxcurioni/source/blender/gpu/SConscript
branches/soc-2008-mxcurioni/source/blender/gpu/intern/
branches/soc-2008-mxcurioni/source/blender/gpu/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_DelaySensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_DelaySensor.h
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolyProxy.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/BL_ShapeActionActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_ActuatorSensor.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_PolyProxy.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/KX_StateActuator.py
branches/soc-2008-mxcurioni/source/gameengine/PyDoc/SCA_DelaySensor.py
Removed Paths:
-------------
branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES/
branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
branches/soc-2008-mxcurioni/projectfiles_vc7/blender/gpu/BL_gpu.vcproj
branches/soc-2008-mxcurioni/release/text/release_246.txt
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_draw.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_material.h
branches/soc-2008-mxcurioni/source/blender/gpu/Makefile
branches/soc-2008-mxcurioni/source/blender/gpu/SConscript
branches/soc-2008-mxcurioni/source/blender/gpu/intern/
branches/soc-2008-mxcurioni/source/blender/gpu/intern/Makefile
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_codegen.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_draw.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_vertex.glsl.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.cpp
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderPolyMaterial.h
Modified: branches/soc-2008-mxcurioni/CMake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/CMake/macros.cmake 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/CMake/macros.cmake 2008-09-08 18:37:24 UTC (rev 16425)
@@ -38,6 +38,10 @@
ENDMACRO(BLENDERLIB)
MACRO(SETUP_LIBDIRS)
+ # see "cmake --help-policy CMP0003"
+ if(COMMAND cmake_policy)
+ CMAKE_POLICY(SET CMP0003 NEW)
+ endif(COMMAND cmake_policy)
LINK_DIRECTORIES(${PYTHON_LIBPATH} ${SDL_LIBPATH} ${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${ICONV_LIBPATH} ${OPENEXR_LIBPATH} ${QUICKTIME_LIBPATH} ${FFMPEG_LIBPATH})
IF(WITH_INTERNATIONAL)
LINK_DIRECTORIES(${GETTEXT_LIBPATH})
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2008-09-08 18:37:24 UTC (rev 16425)
@@ -63,7 +63,6 @@
OPTION(WITH_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
OPTION(WITH_FFMPEG "Enable FFMPeg Support (http://ffmpeg.mplayerhq.hu/)" OFF)
OPTION(WITH_OPENAL "Enable OpenAL Support (http://www.openal.org)" ON)
-OPTION(YESIAMSTUPID "Enable execution on 64-bit platforms" OFF)
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -183,9 +182,9 @@
SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++")
IF(WITH_OPENMP)
- SET(LLIBS "${LLIBS} -lgomp ")
- SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+ SET(LLIBS "${LLIBS} -lgomp")
+ SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+ SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
ENDIF(WITH_OPENMP)
@@ -249,7 +248,11 @@
SET(GETTEXT ${LIBDIR}/gettext)
SET(GETTEXT_INC ${GETTEXT}/include)
- SET(GETTEXT_LIB gnu_gettext)
+ IF(CMAKE_CL_64)
+ SET(GETTEXT_LIB gettextlib)
+ ELSE(CMAKE_CL_64)
+ SET(GETTEXT_LIB gnu_gettext)
+ ENDIF(CMAKE_CL_64)
SET(GETTEXT_LIBPATH ${GETTEXT}/lib)
SET(FREETYPE ${LIBDIR}/freetype)
@@ -280,7 +283,12 @@
SET(FFMPEG_LIB avcodec-51 avformat-52 avdevice-52 avutil-49 swscale-0)
SET(FFMPEG_LIBPATH ${FFMPEG}/lib)
+ IF(CMAKE_CL_64)
+ SET(LLIBS kernel32 user32 vfw32 winmm ws2_32 )
+ ELSE(CMAKE_CL_64)
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
+ ENDIF(CMAKE_CL_64)
+
IF(WITH_OPENAL)
SET(LLIBS ${LLIBS} dxguid)
ENDIF(WITH_OPENAL)
@@ -318,7 +326,7 @@
SET(WINTAB_INC ${LIBDIR}/wintab/include)
IF(CMAKE_CL_64)
- SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib;MSVCRT.lib ")
+ SET(PLATFORM_LINKFLAGS "/MACHINE:X64 /NODEFAULTLIB:libc.lib;MSVCRT.lib ")
ELSE(CMAKE_CL_64)
SET(PLATFORM_LINKFLAGS "/NODEFAULTLIB:libc.lib ")
ENDIF(CMAKE_CL_64)
Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/SConstruct 2008-09-08 18:37:24 UTC (rev 16425)
@@ -184,15 +184,16 @@
env['CPPFLAGS'].append('/openmp')
env['CXXFLAGS'].append('/openmp')
else:
- if env['CC'] == 'icc':
+ if env['CC'][-3:] == 'icc': # to be able to handle CC=/opt/bla/icc case
env.Append(LINKFLAGS=['-openmp', '-static-intel'])
env['CCFLAGS'].append('-openmp')
env['CPPFLAGS'].append('-openmp')
env['CXXFLAGS'].append('-openmp')
else:
- env['CCFLAGS'].append('-fopenmp')
- env['CPPFLAGS'].append('-fopenmp')
- env['CXXFLAGS'].append('-fopenmp')
+ env.Append(CCFLAGS=['-fopenmp'])
+ env.Append(CPPFLAGS=['-fopenmp'])
+ env.Append(CXXFLAGS=['-fopenmp'])
+ # env.Append(LINKFLAGS=['-fprofile-generate'])
#check for additional debug libnames
Modified: branches/soc-2008-mxcurioni/bin/.blender/.Blanguages
===================================================================
--- branches/soc-2008-mxcurioni/bin/.blender/.Blanguages 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/bin/.blender/.Blanguages 2008-09-08 18:37:24 UTC (rev 16425)
@@ -20,3 +20,4 @@
Arabic:ar
Bulgarian:bg
Greek:el
+Korean:kr
Copied: branches/soc-2008-mxcurioni/bin/.blender/locale/kr (from rev 16424, trunk/blender/bin/.blender/locale/kr)
Copied: branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES (from rev 16424, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES)
Deleted: branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES/blender.mo
===================================================================
(Binary files differ)
Copied: branches/soc-2008-mxcurioni/bin/.blender/locale/kr/LC_MESSAGES/blender.mo (from rev 16424, trunk/blender/bin/.blender/locale/kr/LC_MESSAGES/blender.mo)
===================================================================
(Binary files differ)
Modified: branches/soc-2008-mxcurioni/blenderplayer/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/blenderplayer/CMakeLists.txt 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/blenderplayer/CMakeLists.txt 2008-09-08 18:37:24 UTC (rev 16425)
@@ -90,6 +90,7 @@
bf_soundsystem
bf_kernel
bf_nodes
+ bf_gpu
bf_imbuf
bf_avi
kx_network
Modified: branches/soc-2008-mxcurioni/config/linux2-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/linux2-config.py 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/config/linux2-config.py 2008-09-08 18:37:24 UTC (rev 16425)
@@ -143,7 +143,7 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}/include'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-WITH_BF_REDCODE = 'true'
+WITH_BF_REDCODE = 'false'
BF_REDCODE = '#extern/libredcode'
BF_REDCODE_LIB = ''
# Uncomment the following two lines to use system's ffmpeg
Modified: branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp
===================================================================
--- branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp 2008-09-08 15:15:00 UTC (rev 16424)
+++ branches/soc-2008-mxcurioni/extern/bullet2/src/BulletCollision/CollisionDispatch/btCollisionWorld.cpp 2008-09-08 18:37:24 UTC (rev 16425)
@@ -181,7 +181,9 @@
btCollisionObject* collisionObject,
const btCollisionShape* collisionShape,
const btTransform& colObjWorldTransform,
- RayResultCallback& resultCallback,short int collisionFilterMask)
+ RayResultCallback& resultCallback,
+ short int collisionFilterMask,
+ bool faceNormal)
{
btSphereShape pointShape(btScalar(0.0));
@@ -191,14 +193,16 @@
collisionObject,
collisionShape,
colObjWorldTransform,
- resultCallback,collisionFilterMask);
+ resultCallback,collisionFilterMask,faceNormal);
}
void btCollisionWorld::objectQuerySingle(const btConvexShape* castShape,const btTransform& rayFromTrans,const btTransform& rayToTrans,
btCollisionObject* collisionObject,
const btCollisionShape* collisionShape,
const btTransform& colObjWorldTransform,
- RayResultCallback& resultCallback,short int collisionFilterMask)
+ RayResultCallback& resultCallback,
+ short int collisionFilterMask,
+ bool faceNormal)
{
@@ -257,9 +261,9 @@
btCollisionObject* m_collisionObject;
btTriangleMeshShape* m_triangleMesh;
- BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,
- btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape* triangleMesh):
- btTriangleRaycastCallback(from,to),
+ BridgeTriangleRaycastCallback( const btVector3& from,const btVector3& to,bool faceNormal,
+ btCollisionWorld::RayResultCallback* resultCallback, btCollisionObject* collisionObject,btTriangleMeshShape* triangleMesh):
+ btTriangleRaycastCallback(from,to,faceNormal),
m_resultCallback(resultCallback),
m_collisionObject(collisionObject),
m_triangleMesh(triangleMesh)
@@ -272,6 +276,7 @@
btCollisionWorld::LocalShapeInfo shapeInfo;
shapeInfo.m_shapePart = partId;
shapeInfo.m_triangleIndex = triangleIndex;
+ shapeInfo.m_triangleShape = m_triangleMesh;
btCollisionWorld::LocalRayResult rayResult
(m_collisionObject,
@@ -287,7 +292,7 @@
};
- BridgeTriangleRaycastCallback rcb(rayFromLocal,rayToLocal,&resultCallback,collisionObject,triangleMesh);
+ BridgeTriangleRaycastCallback rcb(rayFromLocal,rayToLocal,faceNormal,&resultCallback,collisionObject,triangleMesh);
rcb.m_hitFraction = resultCallback.m_closestHitFraction;
btVector3 rayAabbMinLocal = rayFromLocal;
@@ -313,7 +318,7 @@
collisionObject,
childCollisionShape,
childWorldTrans,
- resultCallback, collisionFilterMask);
+ resultCallback, collisionFilterMask, faceNormal);
}
@@ -323,7 +328,7 @@
}
}
-void btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback,short int collisionFilterMask)
+void btCollisionWorld::rayTest(const btVector3& rayFromWorld, const btVector3& rayToWorld, RayResultCallback& resultCallback,short int collisionFilterMask, bool faceNormal)
{
@@ -350,11 +355,17 @@
btVector3 hitNormal;
if (btRayAabb(rayFromWorld,rayToWorld,collisionObjectAabbMin,collisionObjectAabbMax,hitLambda,hitNormal))
{
- rayTestSingle(rayFromTrans,rayToTrans,
- collisionObject,
- collisionObject->getCollisionShape(),
- collisionObject->getWorldTransform(),
- resultCallback);
+ // before testing this object, verify that it is not filtered out
+ if (resultCallback.NeedRayCast(collisionObject))
+ {
+ rayTestSingle(rayFromTrans,rayToTrans,
+ collisionObject,
+ collisionObject->getCollisionShape(),
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list