[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [22102] branches/soc-2009-yukishiro: merge till 22090
Jingyuan Huang
jingyuan.huang at gmail.com
Sat Aug 1 02:09:58 CEST 2009
Revision: 22102
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22102
Author: yukishiro
Date: 2009-08-01 02:09:57 +0200 (Sat, 01 Aug 2009)
Log Message:
-----------
merge till 22090
Modified Paths:
--------------
branches/soc-2009-yukishiro/config/darwin-config.py
branches/soc-2009-yukishiro/config/irix6-config.py
branches/soc-2009-yukishiro/config/linux2-config.py
branches/soc-2009-yukishiro/config/linuxcross-config.py
branches/soc-2009-yukishiro/config/openbsd3-config.py
branches/soc-2009-yukishiro/config/sunos5-config.py
branches/soc-2009-yukishiro/config/win32-mingw-config.py
branches/soc-2009-yukishiro/config/win32-vc-config.py
branches/soc-2009-yukishiro/intern/CMakeLists.txt
branches/soc-2009-yukishiro/intern/Makefile
branches/soc-2009-yukishiro/intern/SConscript
branches/soc-2009-yukishiro/intern/elbeem/intern/solver_init.cpp
branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2009-yukishiro/release/datafiles/blenderbuttons
branches/soc-2009-yukishiro/release/ui/buttons_data_lamp.py
branches/soc-2009-yukishiro/release/ui/buttons_data_modifier.py
branches/soc-2009-yukishiro/release/ui/buttons_game.py
branches/soc-2009-yukishiro/release/ui/buttons_material.py
branches/soc-2009-yukishiro/release/ui/buttons_object.py
branches/soc-2009-yukishiro/release/ui/buttons_object_constraint.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_field.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_fluid.py
branches/soc-2009-yukishiro/release/ui/buttons_physics_softbody.py
branches/soc-2009-yukishiro/release/ui/buttons_scene.py
branches/soc-2009-yukishiro/release/ui/buttons_texture.py
branches/soc-2009-yukishiro/release/ui/buttons_world.py
branches/soc-2009-yukishiro/release/ui/space_console.py
branches/soc-2009-yukishiro/release/ui/space_filebrowser.py
branches/soc-2009-yukishiro/release/ui/space_image.py
branches/soc-2009-yukishiro/release/ui/space_info.py
branches/soc-2009-yukishiro/release/ui/space_sequencer.py
branches/soc-2009-yukishiro/source/Makefile
branches/soc-2009-yukishiro/source/blender/blenfont/BLF_api.h
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf.c
branches/soc-2009-yukishiro/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_blender.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_cloth.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_modifier.h
branches/soc-2009-yukishiro/source/blender/blenkernel/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/blenkernel/SConscript
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/Makefile
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/armature.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/blender.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/exotic.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/screen.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-yukishiro/source/blender/blenlib/BLI_kdopbvh.h
branches/soc-2009-yukishiro/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2009-yukishiro/source/blender/blenlib/intern/fileops.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/readfile.c
branches/soc-2009-yukishiro/source/blender/blenloader/intern/writefile.c
branches/soc-2009-yukishiro/source/blender/editors/CMakeLists.txt
branches/soc-2009-yukishiro/source/blender/editors/Makefile
branches/soc-2009-yukishiro/source/blender/editors/SConscript
branches/soc-2009-yukishiro/source/blender/editors/animation/keyframing.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_retarget.c
branches/soc-2009-yukishiro/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2009-yukishiro/source/blender/editors/armature/meshlaplacian.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-yukishiro/source/blender/editors/datafiles/blenderbuttons.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_armature.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_previewrender.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_screen_types.h
branches/soc-2009-yukishiro/source/blender/editors/include/ED_util.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_icons.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_interface.h
branches/soc-2009-yukishiro/source/blender/editors/include/UI_view2d.h
branches/soc-2009-yukishiro/source/blender/editors/interface/interface.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_anim.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_layout.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_regions.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_style.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_templates.c
branches/soc-2009-yukishiro/source/blender/editors/interface/interface_widgets.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d.c
branches/soc-2009-yukishiro/source/blender/editors/interface/view2d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_add.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-yukishiro/source/blender/editors/mesh/meshtools.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_edit.c
branches/soc-2009-yukishiro/source/blender/editors/object/object_intern.h
branches/soc-2009-yukishiro/source/blender/editors/object/object_ops.c
branches/soc-2009-yukishiro/source/blender/editors/physics/ed_fluidsim.c
branches/soc-2009-yukishiro/source/blender/editors/preview/previewrender.c
branches/soc-2009-yukishiro/source/blender/editors/screen/area.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_edit.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screen_ops.c
branches/soc-2009-yukishiro/source/blender/editors/screen/screendump.c
branches/soc-2009-yukishiro/source/blender/editors/space_action/action_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/buttons_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_console/console_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_console/space_console.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/file_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/fsmenu.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/space_file.c
branches/soc-2009-yukishiro/source/blender/editors/space_file/writeimage.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/image_draw.c
branches/soc-2009-yukishiro/source/blender/editors/space_image/space_image.c
branches/soc-2009-yukishiro/source/blender/editors/space_info/space_info.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/logic_window.c
branches/soc-2009-yukishiro/source/blender/editors/space_logic/space_logic.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2009-yukishiro/source/blender/editors/space_nla/space_nla.c
branches/soc-2009-yukishiro/source/blender/editors/space_node/space_node.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/space_text.c
branches/soc-2009-yukishiro/source/blender/editors/space_text/text_python.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/Makefile
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/SConscript
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-yukishiro/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_generics.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_input.c
branches/soc-2009-yukishiro/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-yukishiro/source/blender/editors/util/editmode_undo.c
branches/soc-2009-yukishiro/source/blender/editors/util/undo.c
branches/soc-2009-yukishiro/source/blender/editors/util/util_intern.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_anim_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_meta_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_view2d_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-yukishiro/source/blender/makesdna/intern/makesdna.c
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_access.h
branches/soc-2009-yukishiro/source/blender/makesrna/RNA_enum_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_animation.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_brush.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_material.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_meta.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_nla.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_world.c
branches/soc-2009-yukishiro/source/blender/python/generic/bpy_internal_import.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_operator.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.c
branches/soc-2009-yukishiro/source/blender/python/intern/bpy_rna.h
branches/soc-2009-yukishiro/source/blender/render/intern/source/pipeline.c
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_api.h
branches/soc-2009-yukishiro/source/blender/windowmanager/WM_types.h
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-yukishiro/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-yukishiro/source/blender/windowmanager/wm_event_types.h
branches/soc-2009-yukishiro/source/creator/CMakeLists.txt
branches/soc-2009-yukishiro/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_SkinMeshObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/BL_SkinMeshObject.h
branches/soc-2009-yukishiro/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2009-yukishiro/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2009-yukishiro/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2009-yukishiro/source/gameengine/GameLogic/SCA_IScene.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_SCA_ReplaceMeshActuator.h
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2009-yukishiro/source/gameengine/Ketsji/KX_Scene.h
branches/soc-2009-yukishiro/source/gameengine/PyDoc/GameTypes.py
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2009-yukishiro/source/gameengine/Rasterizer/RAS_MeshObject.h
branches/soc-2009-yukishiro/source/nan_definitions.mk
Added Paths:
-----------
branches/soc-2009-yukishiro/intern/smoke/
branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt
branches/soc-2009-yukishiro/intern/smoke/Makefile
branches/soc-2009-yukishiro/intern/smoke/SConscript
branches/soc-2009-yukishiro/intern/smoke/extern/
branches/soc-2009-yukishiro/intern/smoke/extern/smoke_API.h
branches/soc-2009-yukishiro/intern/smoke/intern/
branches/soc-2009-yukishiro/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/soc-2009-yukishiro/intern/smoke/intern/FFT_NOISE.h
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.h
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/IMAGE.h
branches/soc-2009-yukishiro/intern/smoke/intern/INTERPOLATE.h
branches/soc-2009-yukishiro/intern/smoke/intern/LICENSE.txt
branches/soc-2009-yukishiro/intern/smoke/intern/LU_HELPER.h
branches/soc-2009-yukishiro/intern/smoke/intern/MERSENNETWISTER.h
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.FFT
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.cygwin
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.linux
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.mac
branches/soc-2009-yukishiro/intern/smoke/intern/OBSTACLE.h
branches/soc-2009-yukishiro/intern/smoke/intern/SPHERE.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/SPHERE.h
branches/soc-2009-yukishiro/intern/smoke/intern/VEC3.h
branches/soc-2009-yukishiro/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2009-yukishiro/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/WTURBULENCE.h
branches/soc-2009-yukishiro/intern/smoke/intern/main.cpp.back
branches/soc-2009-yukishiro/intern/smoke/intern/smoke_API.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/jama_eig.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/jama_lu.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array1d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array2d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array3d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_cmat.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_math_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_subscript.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_vec.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_version.h
branches/soc-2009-yukishiro/release/ui/buttons_data_metaball.py
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_sketch.h
branches/soc-2009-yukishiro/source/blender/blenkernel/BKE_smoke.h
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/sketch.c
branches/soc-2009-yukishiro/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-yukishiro/source/blender/editors/include/ED_mball.h
branches/soc-2009-yukishiro/source/blender/editors/metaball/
branches/soc-2009-yukishiro/source/blender/editors/metaball/Makefile
branches/soc-2009-yukishiro/source/blender/editors/metaball/SConscript
branches/soc-2009-yukishiro/source/blender/editors/metaball/editmball.c
branches/soc-2009-yukishiro/source/blender/editors/metaball/mball_intern.h
branches/soc-2009-yukishiro/source/blender/editors/metaball/mball_ops.c
branches/soc-2009-yukishiro/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2009-yukishiro/source/blender/makesrna/intern/rna_smoke.c
Removed Paths:
-------------
branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt
branches/soc-2009-yukishiro/intern/smoke/Makefile
branches/soc-2009-yukishiro/intern/smoke/SConscript
branches/soc-2009-yukishiro/intern/smoke/extern/
branches/soc-2009-yukishiro/intern/smoke/extern/smoke_API.h
branches/soc-2009-yukishiro/intern/smoke/intern/
branches/soc-2009-yukishiro/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/soc-2009-yukishiro/intern/smoke/intern/FFT_NOISE.h
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D.h
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/IMAGE.h
branches/soc-2009-yukishiro/intern/smoke/intern/INTERPOLATE.h
branches/soc-2009-yukishiro/intern/smoke/intern/LICENSE.txt
branches/soc-2009-yukishiro/intern/smoke/intern/LU_HELPER.h
branches/soc-2009-yukishiro/intern/smoke/intern/MERSENNETWISTER.h
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.FFT
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.cygwin
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.linux
branches/soc-2009-yukishiro/intern/smoke/intern/Makefile.mac
branches/soc-2009-yukishiro/intern/smoke/intern/OBSTACLE.h
branches/soc-2009-yukishiro/intern/smoke/intern/SPHERE.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/SPHERE.h
branches/soc-2009-yukishiro/intern/smoke/intern/VEC3.h
branches/soc-2009-yukishiro/intern/smoke/intern/WAVELET_NOISE.h
branches/soc-2009-yukishiro/intern/smoke/intern/WTURBULENCE.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/WTURBULENCE.h
branches/soc-2009-yukishiro/intern/smoke/intern/main.cpp.back
branches/soc-2009-yukishiro/intern/smoke/intern/smoke_API.cpp
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/jama_eig.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/jama_lu.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array1d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array1d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array2d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array2d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array3d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_array3d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_cmat.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array1d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array1d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array2d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array2d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array3d.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_fortran_array3d_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_i_refvec.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_math_utils.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_sparse_matrix_csr.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_stopwatch.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_subscript.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_vec.h
branches/soc-2009-yukishiro/intern/smoke/intern/tnt/tnt_version.h
branches/soc-2009-yukishiro/source/blender/editors/metaball/Makefile
branches/soc-2009-yukishiro/source/blender/editors/metaball/SConscript
branches/soc-2009-yukishiro/source/blender/editors/metaball/editmball.c
branches/soc-2009-yukishiro/source/blender/editors/metaball/mball_intern.h
branches/soc-2009-yukishiro/source/blender/editors/metaball/mball_ops.c
Property Changed:
----------------
branches/soc-2009-yukishiro/release/io/engine_render_pov.py
Modified: branches/soc-2009-yukishiro/config/darwin-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/darwin-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/darwin-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -151,7 +151,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE=True
-WITH_BF_PLAYER=True
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/irix6-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/irix6-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/irix6-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -73,6 +73,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE='false'
+WITH_BF_PLAYER = 'false'
WITH_BF_BULLET = 'true'
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/linux2-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linux2-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/linux2-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -67,7 +67,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/linuxcross-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/linuxcross-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/linuxcross-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -73,6 +73,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/openbsd3-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/openbsd3-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/openbsd3-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -60,6 +60,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE=False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/sunos5-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/sunos5-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/sunos5-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -68,6 +68,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE=False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/win32-mingw-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/win32-mingw-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -81,6 +81,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = False
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/config/win32-vc-config.py
===================================================================
--- branches/soc-2009-yukishiro/config/win32-vc-config.py 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/config/win32-vc-config.py 2009-08-01 00:09:57 UTC (rev 22102)
@@ -88,7 +88,7 @@
BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
WITH_BF_GAMEENGINE = True
-WITH_BF_PLAYER = True
+WITH_BF_PLAYER = False
WITH_BF_BULLET = True
BF_BULLET = '#extern/bullet2/src'
Modified: branches/soc-2009-yukishiro/intern/CMakeLists.txt
===================================================================
--- branches/soc-2009-yukishiro/intern/CMakeLists.txt 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/intern/CMakeLists.txt 2009-08-01 00:09:57 UTC (rev 22102)
@@ -35,6 +35,7 @@
ADD_SUBDIRECTORY(iksolver)
ADD_SUBDIRECTORY(boolop)
ADD_SUBDIRECTORY(opennl)
+ADD_SUBDIRECTORY(smoke)
IF(WITH_ELBEEM)
ADD_SUBDIRECTORY(elbeem)
Modified: branches/soc-2009-yukishiro/intern/Makefile
===================================================================
--- branches/soc-2009-yukishiro/intern/Makefile 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/intern/Makefile 2009-08-01 00:09:57 UTC (rev 22102)
@@ -32,7 +32,7 @@
# include nan_subdirs.mk
ALLDIRS = string ghost guardedalloc moto container memutil
-ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop
+ALLDIRS += decimation iksolver bsp SoundSystem opennl elbeem boolop smoke
all::
@for i in $(ALLDIRS); do \
Modified: branches/soc-2009-yukishiro/intern/SConscript
===================================================================
--- branches/soc-2009-yukishiro/intern/SConscript 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/intern/SConscript 2009-08-01 00:09:57 UTC (rev 22102)
@@ -11,7 +11,8 @@
'decimation/SConscript',
'iksolver/SConscript',
'boolop/SConscript',
- 'opennl/SConscript'])
+ 'opennl/SConscript',
+ 'smoke/SConscript'])
# NEW_CSG was intended for intern/csg, but
# getting it to compile is difficult
Modified: branches/soc-2009-yukishiro/intern/elbeem/intern/solver_init.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/elbeem/intern/solver_init.cpp 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/intern/elbeem/intern/solver_init.cpp 2009-08-01 00:09:57 UTC (rev 22102)
@@ -1464,7 +1464,7 @@
obj->applyTransformation(targetTime, &mMOIVertices,NULL /* no old normals needed */, 0, mMOIVertices.size(), false );
} else {
// only do transform update
- obj->getMovingPoints(mMOIVertices,pNormals);
+ obj->getMovingPoints(mMOIVertices,pNormals); // mMOIVertices = mCachedMovPoints
mMOIVerticesOld = mMOIVertices;
// WARNING - assumes mSimulationTime is global!?
obj->applyTransformation(targetTime, &mMOIVertices,pNormals, 0, mMOIVertices.size(), false );
Modified: branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_SystemX11.cpp 2009-07-31 23:49:12 UTC (rev 22101)
+++ branches/soc-2009-yukishiro/intern/ghost/intern/GHOST_SystemX11.cpp 2009-08-01 00:09:57 UTC (rev 22102)
@@ -534,11 +534,28 @@
window, data);
}
} else if (((Atom)xcme.data.l[0]) == m_wm_take_focus) {
+ XWindowAttributes attr;
+ Window fwin;
+ int revert_to;
+
/* as ICCCM say, we need reply this event
* with a SetInputFocus, the data[1] have
* the valid timestamp (send by the wm).
+ *
+ * Some WM send this event before the
+ * window is really mapped (for example
+ * change from virtual desktop), so we need
+ * to be sure that our windows is mapped
+ * or this call fail and close blender.
*/
- XSetInputFocus(m_display, xcme.window, RevertToParent, xcme.data.l[1]);
+ if (XGetWindowAttributes(m_display, xcme.window, &attr) == True) {
+ if (XGetInputFocus(m_display, &fwin, &revert_to) == True) {
+ if (attr.map_state == IsViewable) {
+ if (fwin != xcme.window)
+ XSetInputFocus(m_display, xcme.window, RevertToParent, xcme.data.l[1]);
+ }
+ }
+ }
} else {
/* Unknown client message, ignore */
}
Copied: branches/soc-2009-yukishiro/intern/smoke (from rev 22099, branches/blender2.5/blender/intern/smoke)
Deleted: branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/intern/smoke/CMakeLists.txt 2009-07-31 23:16:38 UTC (rev 22099)
+++ branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt 2009-08-01 00:09:57 UTC (rev 22102)
@@ -1,38 +0,0 @@
-# $Id$
-# ***** BEGIN GPL LICENSE BLOCK *****
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# The Original Code is Copyright (C) 2006, Blender Foundation
-# All rights reserved.
-#
-# The Original Code is: all of this file.
-#
-# Contributor(s): Daniel Genrich
-#
-# ***** END GPL LICENSE BLOCK *****
-
-SET(INC ${PNG_INC} ${ZLIB_INC} intern ../../extern/bullet2/src ../memutil ../guardealloc)
-# ${FFTW3_INC}
-
-FILE(GLOB SRC intern/*.cpp)
-
-IF(WITH_OPENMP)
- ADD_DEFINITIONS(-DPARALLEL=1)
-ENDIF(WITH_OPENMP)
-
-
-BLENDERLIB(bf_smoke "${SRC}" "${INC}")
-#, libtype='blender', priority = 0 )
Copied: branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt (from rev 22099, branches/blender2.5/blender/intern/smoke/CMakeLists.txt)
===================================================================
--- branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt (rev 0)
+++ branches/soc-2009-yukishiro/intern/smoke/CMakeLists.txt 2009-08-01 00:09:57 UTC (rev 22102)
@@ -0,0 +1,38 @@
+# $Id$
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list