[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [32685] branches/soc-2008-mxcurioni: Merged changes in the trunk up to revision 32684.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Sun Oct 24 15:05:09 CEST 2010
Revision: 32685
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32685
Author: kjym3
Date: 2010-10-24 15:05:09 +0200 (Sun, 24 Oct 2010)
Log Message:
-----------
Merged changes in the trunk up to revision 32684.
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=32684
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
branches/soc-2008-mxcurioni/build_files/scons/config/aix4-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/irix6-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
branches/soc-2008-mxcurioni/build_files/scons/tools/btools.py
branches/soc-2008-mxcurioni/extern/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/bullet2/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libopenjpeg/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/libopenjpeg/event.c
branches/soc-2008-mxcurioni/extern/lzma/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/lzo/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/audaspace/Makefile
branches/soc-2008-mxcurioni/intern/boolop/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/bsp/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/container/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/decimation/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/elbeem/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/elbeem/intern/solver_init.cpp
branches/soc-2008-mxcurioni/intern/elbeem/intern/utilities.h
branches/soc-2008-mxcurioni/intern/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/ghost/SConscript
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2008-mxcurioni/intern/iksolver/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/itasc/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/memutil/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/moto/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/opennl/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/opennl/superlu/smemory.c
branches/soc-2008-mxcurioni/intern/smoke/CMakeLists.txt
branches/soc-2008-mxcurioni/intern/string/CMakeLists.txt
branches/soc-2008-mxcurioni/release/scripts/modules/sys_info.py
branches/soc-2008-mxcurioni/release/scripts/op/animsys_update.py
branches/soc-2008-mxcurioni/release/scripts/op/uv.py
branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/source/Makefile
branches/soc-2008-mxcurioni/source/blender/avi/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/avi/intern/avi.c
branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_cloth.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_collision.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_idprop.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_smoke.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/depsgraph_private.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.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/exotic.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/font.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/multires.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/packedFile.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequencer.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.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/blenkernel/intern/unit.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_base.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_math_vector.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/bpath.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_base.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_matrix.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_rotation.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/math_vector.c
branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/blenloader/SConscript
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenpluginapi/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/collada/MaterialExporter.cpp
branches/soc-2008-mxcurioni/source/blender/editors/animation/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/armature/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/curve/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/gpencil/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_image.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_screen.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2008-mxcurioni/source/blender/editors/metaball/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/object/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_select.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/render/render_internal.c
branches/soc-2008-mxcurioni/source/blender/editors/render/render_opengl.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/screen/area.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_console/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_file/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_info/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_node/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sound/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_text/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_time/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_manipulator.c
branches/soc-2008-mxcurioni/source/blender/editors/util/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/IMB_imbuf_types.h
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dds/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/openexr/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_vfont_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/modifiers/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/modifiers/Makefile
branches/soc-2008-mxcurioni/source/blender/modifiers/SConscript
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_array.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_fluidsim_util.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2008-mxcurioni/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2008-mxcurioni/source/blender/nodes/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_color.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_euler.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_quat.c
branches/soc-2008-mxcurioni/source/blender/python/generic/mathutils_vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_app.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_props.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2008-mxcurioni/source/blender/quicktime/apple/quicktime_import.c
branches/soc-2008-mxcurioni/source/blender/readblenfile/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/render/extern/include/RE_shader_ext.h
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/rayobject.cpp
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/shadeoutput.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
branches/soc-2008-mxcurioni/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/buildinfo.c
branches/soc-2008-mxcurioni/source/creator/creator.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/CMakeLists.txt
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/Expressions/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_IInputDevice.h
branches/soc-2008-mxcurioni/source/gameengine/GameLogic/SCA_KeyboardSensor.cpp
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_TouchEventManager.cpp
branches/soc-2008-mxcurioni/source/gameengine/Network/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
branches/soc-2008-mxcurioni/source/gameengine/Physics/Dummy/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Physics/common/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/SceneGraph/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/CMakeLists.txt
branches/soc-2008-mxcurioni/source/gameengine/VideoTexture/VideoBase.cpp
branches/soc-2008-mxcurioni/source/kernel/CMakeLists.txt
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/engine.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/outputs/
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/outputs/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/outputs/xml_output.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/plugin.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/util.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/validate.py
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim_movie.c
Removed Paths:
-------------
branches/soc-2008-mxcurioni/extern/bullet2/make/
branches/soc-2008-mxcurioni/extern/glew/make/
branches/soc-2008-mxcurioni/extern/lzma/make/
branches/soc-2008-mxcurioni/extern/lzo/make/
branches/soc-2008-mxcurioni/extern/make/
branches/soc-2008-mxcurioni/intern/audaspace/make/
branches/soc-2008-mxcurioni/intern/boolop/make/
branches/soc-2008-mxcurioni/intern/bsp/make/
branches/soc-2008-mxcurioni/intern/container/make/
branches/soc-2008-mxcurioni/intern/decimation/make/
branches/soc-2008-mxcurioni/intern/decimation/test/decimate_glut_test/make/
branches/soc-2008-mxcurioni/intern/elbeem/make/
branches/soc-2008-mxcurioni/intern/ghost/make/
branches/soc-2008-mxcurioni/intern/ghost/test/make/
branches/soc-2008-mxcurioni/intern/guardedalloc/make/
branches/soc-2008-mxcurioni/intern/iksolver/make/
branches/soc-2008-mxcurioni/intern/iksolver/test/ik_glut_test/make/
branches/soc-2008-mxcurioni/intern/itasc/make/
branches/soc-2008-mxcurioni/intern/make/
branches/soc-2008-mxcurioni/intern/memutil/make/
branches/soc-2008-mxcurioni/intern/moto/make/
branches/soc-2008-mxcurioni/intern/opennl/make/
branches/soc-2008-mxcurioni/intern/smoke/make/
branches/soc-2008-mxcurioni/intern/string/make/
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/engine.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/outputs/
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/outputs/__init__.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/outputs/xml_output.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/plugin.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/ui.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/util.py
branches/soc-2008-mxcurioni/release/scripts/modules/extensions_framework/validate.py
branches/soc-2008-mxcurioni/source/blender/imbuf/intern/anim.c
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2010-10-24 13:05:09 UTC (rev 32685)
@@ -68,7 +68,6 @@
OPTION(WITH_INTERNATIONAL "Enable I18N (International fonts and text)" ON)
OPTION(WITH_PYTHON "Enable Embedded Python API" ON)
OPTION(WITH_BUILDINFO "Include extra build details" ON)
-OPTION(WITH_FLUID "Enable Elbeem (Fluid Simulation)" ON)
OPTION(WITH_IK_ITASC "Enable ITASC IK solver" ON)
OPTION(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
OPTION(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
@@ -81,6 +80,11 @@
OPTION(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" OFF)
ENDIF()
+# Modifiers
+OPTION(WITH_MOD_FLUID "Enable Elbeem Modifier (Fluid Simulation)" ON)
+OPTION(WITH_MOD_DECIMATE "Enable Decimate Modifier" ON)
+OPTION(WITH_MOD_BOOLEAN "Enable Boolean Modifier" ON)
+
# Image format support
OPTION(WITH_IMAGE_OPENEXR "Enable OpenEXR Support (http://www.openexr.com)" ON)
OPTION(WITH_IMAGE_OPENJPEG "Enable OpenJpeg Support (http://www.openjpeg.org/)" OFF)
@@ -402,8 +406,8 @@
SET(LLIBS kernel32 user32 gdi32 comdlg32 advapi32 shell32 ole32 oleaut32 uuid ws2_32 vfw32 winmm)
ENDIF(CMAKE_CL_64)
- SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
- SET(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /wd4800 /wd4244 /wd4305" CACHE STRING "MSVC MT C++ flags " FORCE)
+ SET(CMAKE_CXX_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
+ SET(CMAKE_C_FLAGS "/D_CRT_NONSTDC_NO_DEPRECATE /D_CRT_SECURE_NO_DEPRECATE /D_SCL_SECURE_NO_DEPRECATE /we4013 /wd4800 /wd4244 /wd4305 /wd4065 /wd4267" CACHE STRING "MSVC MT C++ flags " FORCE)
IF(CMAKE_CL_64)
SET(CMAKE_CXX_FLAGS_DEBUG "/D_DEBUG /Od /Gm /EHsc /RTC1 /MTd /W3 /nologo /Zi /J" CACHE STRING "MSVC MT flags " FORCE)
Modified: branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/build_files/cmake/macros.cmake 2010-10-24 13:05:09 UTC (rev 32685)
@@ -1,31 +1,46 @@
-MACRO(BLENDERLIB_NOLIST
- name
- sources
- includes)
- # Gather all headers
- FILE(GLOB_RECURSE INC_ALL *.h)
-
- INCLUDE_DIRECTORIES(${includes})
- ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+IF(MSVC)
+ # only MSVC uses SOURCE_GROUP
+ MACRO(BLENDERLIB_NOLIST
+ name
+ sources
+ includes)
- # Group by location on disk
- SOURCE_GROUP(Files FILES CMakeLists.txt)
- SET(ALL_FILES ${sources} ${INC_ALL})
- FOREACH(SRC ${ALL_FILES})
- STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
- STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
- STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
- IF(REL_DIR)
- SOURCE_GROUP(${REL_DIR} FILES ${SRC})
- ELSE(REL_DIR)
- SOURCE_GROUP(Files FILES ${SRC})
- ENDIF(REL_DIR)
- ENDFOREACH(SRC)
+ MESSAGE(STATUS "Configuring library ${name}")
- MESSAGE(STATUS "Configuring library ${name}")
-ENDMACRO(BLENDERLIB_NOLIST)
+ # Gather all headers
+ FILE(GLOB_RECURSE INC_ALL *.h)
+
+ INCLUDE_DIRECTORIES(${includes})
+ ADD_LIBRARY(${name} ${INC_ALL} ${sources})
+ # Group by location on disk
+ SOURCE_GROUP(Files FILES CMakeLists.txt)
+ SET(ALL_FILES ${sources} ${INC_ALL})
+ FOREACH(SRC ${ALL_FILES})
+ STRING(REGEX REPLACE ${CMAKE_CURRENT_SOURCE_DIR} "Files" REL_DIR "${SRC}")
+ STRING(REGEX REPLACE "[\\\\/][^\\\\/]*$" "" REL_DIR "${REL_DIR}")
+ STRING(REGEX REPLACE "^[\\\\/]" "" REL_DIR "${REL_DIR}")
+ IF(REL_DIR)
+ SOURCE_GROUP(${REL_DIR} FILES ${SRC})
+ ELSE(REL_DIR)
+ SOURCE_GROUP(Files FILES ${SRC})
+ ENDIF(REL_DIR)
+ ENDFOREACH(SRC)
+ ENDMACRO(BLENDERLIB_NOLIST)
+ELSE(MSVC)
+
+ MACRO(BLENDERLIB_NOLIST
+ name
+ sources
+ includes)
+
+ MESSAGE(STATUS "Configuring library ${name}")
+ INCLUDE_DIRECTORIES(${includes})
+ ADD_LIBRARY(${name} ${sources})
+ ENDMACRO(BLENDERLIB_NOLIST)
+ENDIF(MSVC)
+
MACRO(BLENDERLIB
name
sources
@@ -223,7 +238,42 @@
ENDMACRO(TEST_SSE_SUPPORT)
+# when we have warnings as errors applied globally this
+# needs to be removed for some external libs which we dont maintain.
+# utility macro
+MACRO(_REMOVE_STRICT_FLAGS
+ flag)
+
+ STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELEASE ${CMAKE_C_FLAGS_RELEASE})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_MINSIZEREL ${CMAKE_C_FLAGS_MINSIZEREL})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_C_FLAGS_RELWITHDEBINFO ${CMAKE_C_FLAGS_RELWITHDEBINFO})
+
+ STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS_DEBUG})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS_RELEASE})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_MINSIZEREL ${CMAKE_CXX_FLAGS_MINSIZEREL})
+ STRING(REGEX REPLACE ${flag} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO ${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
+
+ENDMACRO(_REMOVE_STRICT_FLAGS)
+
+MACRO(REMOVE_STRICT_FLAGS)
+
+ IF(CMAKE_COMPILER_IS_GNUCC)
+ _REMOVE_STRICT_FLAGS("-Wunused-parameter")
+ _REMOVE_STRICT_FLAGS("-Werror=[^ ]+")
+ _REMOVE_STRICT_FLAGS("-Werror")
+ ENDIF(CMAKE_COMPILER_IS_GNUCC)
+
+ IF(MSVC)
+ # TODO
+ ENDIF(MSVC)
+
+ENDMACRO(REMOVE_STRICT_FLAGS)
+
+
MACRO(GET_BLENDER_VERSION)
FILE(READ ${CMAKE_SOURCE_DIR}/source/blender/blenkernel/BKE_blender.h CONTENT)
STRING(REGEX REPLACE "\n" ";" CONTENT "${CONTENT}")
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/aix4-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/aix4-config.py 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/aix4-config.py 2010-10-24 13:05:09 UTC (rev 32685)
@@ -190,7 +190,7 @@
BF_PROFILE = 'false'
BF_DEBUG = 'false'
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
BF_BUILDDIR = '../build/aix4'
BF_INSTALLDIR='../install/aix4'
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/irix6-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/irix6-config.py 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/irix6-config.py 2010-10-24 13:05:09 UTC (rev 32685)
@@ -171,9 +171,9 @@
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
-C_WARN = '-no_prelink -ptused'
+C_WARN = ['-no_prelink', '-ptused']
-CC_WARN = '-no_prelink -ptused'
+CC_WARN = ['-no_prelink', '-ptused']
##FIX_STUBS_WARNINGS = -Wno-unused
@@ -185,7 +185,7 @@
BF_PROFILE = 'false'
BF_DEBUG = 'false'
-BF_DEBUG_FLAGS = '-g'
+BF_DEBUG_CCFLAGS = ['-g']
BF_BUILDDIR = '../build/irix6'
BF_INSTALLDIR='../install/irix6'
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win32-vc-config.py 2010-10-24 13:05:09 UTC (rev 32685)
@@ -149,7 +149,7 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-WITH_BF_LCMS = True
+WITH_BF_LCMS = False
BF_LCMS = LIBDIR + '/lcms'
BF_LCMS_INC = '${BF_LCMS}/include'
BF_LCMS_LIB = 'lcms'
@@ -170,7 +170,7 @@
CC = 'cl.exe'
CXX = 'cl.exe'
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267', '/we4013']
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast', '/arch:SSE']
Modified: branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/build_files/scons/config/win64-vc-config.py 2010-10-24 13:05:09 UTC (rev 32685)
@@ -145,7 +145,7 @@
BF_OPENCOLLADA_LIB = 'OpenCOLLADAStreamWriter OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils GeneratedSaxParser MathMLSolver xml2 pcre buffer ftoa'
BF_OPENCOLLADA_LIBPATH = '${BF_OPENCOLLADA}/lib'
-WITH_BF_LCMS = True
+WITH_BF_LCMS = False
BF_LCMS = LIBDIR + '/lcms'
BF_LCMS_INC = '${BF_LCMS}/include'
BF_LCMS_LIB = 'lcms'
@@ -166,13 +166,13 @@
CXX = 'cl.exe'
CFLAGS = []
-CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
+CCFLAGS = ['/nologo', '/Ob1', '/J', '/W3', '/Gd', '/we4013', '/wd4244', '/wd4305', '/wd4800', '/wd4065', '/wd4267']
CXXFLAGS = ['/EHsc']
BGE_CXXFLAGS = ['/O2', '/EHsc', '/GR', '/fp:fast']
BF_DEBUG_CCFLAGS = ['/Zi', '/FR${TARGET}.sbr']
-CPPFLAGS = ['-DWIN32','-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
+CPPFLAGS = ['-DWIN32', '-D_CONSOLE', '-D_LIB', '-DFTGL_LIBRARY_STATIC', '-D_CRT_SECURE_NO_DEPRECATE']
REL_CFLAGS = ['-O2', '-DNDEBUG']
REL_CCFLAGS = ['-O2', '-DNDEBUG']
REL_CXXFLAGS = ['-O2', '-DNDEBUG']
Modified: branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2010-10-24 12:54:52 UTC (rev 32684)
+++ branches/soc-2008-mxcurioni/build_files/scons/tools/Blender.py 2010-10-24 13:05:09 UTC (rev 32685)
@@ -295,9 +295,15 @@
build_rev = '-UNKNOWN-'
if lenv['BF_DEBUG']:
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list