[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [30965] branches/soc-2010-leifandersen: Merge with trunk: svn merge -r 30786:30963 https://svn.blender.org/svnroot /bf-blender/trunk/blender/ .
Leif Andersen
leif.a.andersen at gmail.com
Mon Aug 2 05:39:13 CEST 2010
Revision: 30965
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=30965
Author: leifandersen
Date: 2010-08-02 05:39:12 +0200 (Mon, 02 Aug 2010)
Log Message:
-----------
Merge with trunk: svn merge -r 30786:30963 https://svn.blender.org/svnroot/bf-blender/trunk/blender/ .
Modified Paths:
--------------
branches/soc-2010-leifandersen/build_files/scons/config/win32-vc-config.py
branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2010-leifandersen/intern/smoke/extern/smoke_API.h
branches/soc-2010-leifandersen/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2010-leifandersen/intern/smoke/intern/FLUID_3D.h
branches/soc-2010-leifandersen/intern/smoke/intern/smoke_API.cpp
branches/soc-2010-leifandersen/release/scripts/io/export_3ds.py
branches/soc-2010-leifandersen/release/scripts/io/export_fbx.py
branches/soc-2010-leifandersen/release/scripts/io/export_mdd.py
branches/soc-2010-leifandersen/release/scripts/io/export_obj.py
branches/soc-2010-leifandersen/release/scripts/io/export_ply.py
branches/soc-2010-leifandersen/release/scripts/io/export_x3d.py
branches/soc-2010-leifandersen/release/scripts/io/import_anim_bvh.py
branches/soc-2010-leifandersen/release/scripts/io/import_scene_3ds.py
branches/soc-2010-leifandersen/release/scripts/io/import_scene_obj.py
branches/soc-2010-leifandersen/release/scripts/io/import_shape_mdd.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/__init__.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/client.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/operators.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/ui.py
branches/soc-2010-leifandersen/release/scripts/io/netrender/utils.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy/utils.py
branches/soc-2010-leifandersen/release/scripts/modules/bpy_types.py
branches/soc-2010-leifandersen/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-leifandersen/release/scripts/op/add_armature_human.py
branches/soc-2010-leifandersen/release/scripts/op/add_mesh_torus.py
branches/soc-2010-leifandersen/release/scripts/op/console_python.py
branches/soc-2010-leifandersen/release/scripts/op/fcurve_euler_filter.py
branches/soc-2010-leifandersen/release/scripts/op/image.py
branches/soc-2010-leifandersen/release/scripts/op/mesh.py
branches/soc-2010-leifandersen/release/scripts/op/nla.py
branches/soc-2010-leifandersen/release/scripts/op/object.py
branches/soc-2010-leifandersen/release/scripts/op/object_align.py
branches/soc-2010-leifandersen/release/scripts/op/object_randomize_transform.py
branches/soc-2010-leifandersen/release/scripts/op/presets.py
branches/soc-2010-leifandersen/release/scripts/op/screen_play_rendered_anim.py
branches/soc-2010-leifandersen/release/scripts/op/sequencer.py
branches/soc-2010-leifandersen/release/scripts/op/uv.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-leifandersen/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-leifandersen/release/scripts/op/vertexpaint_dirt.py
branches/soc-2010-leifandersen/release/scripts/op/wm.py
branches/soc-2010-leifandersen/release/scripts/templates/operator.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_simple.py
branches/soc-2010-leifandersen/release/scripts/templates/operator_uv.py
branches/soc-2010-leifandersen/release/scripts/templates/panel_simple.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_animviz.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_bone.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_camera.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_curve.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_empty.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_game.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_material.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_particle.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_field.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_render.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_scene.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_texture.py
branches/soc-2010-leifandersen/release/scripts/ui/properties_world.py
branches/soc-2010-leifandersen/release/scripts/ui/space_console.py
branches/soc-2010-leifandersen/release/scripts/ui/space_dopesheet.py
branches/soc-2010-leifandersen/release/scripts/ui/space_filebrowser.py
branches/soc-2010-leifandersen/release/scripts/ui/space_graph.py
branches/soc-2010-leifandersen/release/scripts/ui/space_image.py
branches/soc-2010-leifandersen/release/scripts/ui/space_info.py
branches/soc-2010-leifandersen/release/scripts/ui/space_logic.py
branches/soc-2010-leifandersen/release/scripts/ui/space_nla.py
branches/soc-2010-leifandersen/release/scripts/ui/space_node.py
branches/soc-2010-leifandersen/release/scripts/ui/space_outliner.py
branches/soc-2010-leifandersen/release/scripts/ui/space_sequencer.py
branches/soc-2010-leifandersen/release/scripts/ui/space_text.py
branches/soc-2010-leifandersen/release/scripts/ui/space_time.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref.py
branches/soc-2010-leifandersen/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d.py
branches/soc-2010-leifandersen/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_armature.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_blender.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_brush.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_colortools.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_curve.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_depsgraph.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_image.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_library.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_material.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_mesh.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_pointcache.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_scene.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_text.h
branches/soc-2010-leifandersen/source/blender/blenkernel/BKE_texture.h
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/anim.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/armature.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/blender.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/brush.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/colortools.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/curve.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/font.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/image.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/library.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/material.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/mesh.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/node.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/object.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/particle.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/pointcache.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/scene.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/smoke.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/text.c
branches/soc-2010-leifandersen/source/blender/blenkernel/intern/texture.c
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_math_rotation.h
branches/soc-2010-leifandersen/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-leifandersen/source/blender/blenlib/intern/math_rotation.c
branches/soc-2010-leifandersen/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/readfile.c
branches/soc-2010-leifandersen/source/blender/blenloader/intern/writefile.c
branches/soc-2010-leifandersen/source/blender/collada/DocumentImporter.cpp
branches/soc-2010-leifandersen/source/blender/editors/animation/drivers.c
branches/soc-2010-leifandersen/source/blender/editors/animation/keyframing.c
branches/soc-2010-leifandersen/source/blender/editors/animation/keyingsets.c
branches/soc-2010-leifandersen/source/blender/editors/armature/editarmature.c
branches/soc-2010-leifandersen/source/blender/editors/armature/poseobject.c
branches/soc-2010-leifandersen/source/blender/editors/curve/curve_ops.c
branches/soc-2010-leifandersen/source/blender/editors/curve/editcurve.c
branches/soc-2010-leifandersen/source/blender/editors/datafiles/startup.blend.c
branches/soc-2010-leifandersen/source/blender/editors/include/ED_armature.h
branches/soc-2010-leifandersen/source/blender/editors/include/ED_object.h
branches/soc-2010-leifandersen/source/blender/editors/interface/interface.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_layout.c
branches/soc-2010-leifandersen/source/blender/editors/interface/interface_templates.c
branches/soc-2010-leifandersen/source/blender/editors/interface/resources.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/mesh_ops.c
branches/soc-2010-leifandersen/source/blender/editors/mesh/meshtools.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_add.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_bake.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_constraint.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_edit.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_group.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_hook.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_modifier.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_ops.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_relations.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_select.c
branches/soc-2010-leifandersen/source/blender/editors/object/object_transform.c
branches/soc-2010-leifandersen/source/blender/editors/physics/particle_boids.c
branches/soc-2010-leifandersen/source/blender/editors/physics/particle_edit.c
branches/soc-2010-leifandersen/source/blender/editors/physics/particle_object.c
branches/soc-2010-leifandersen/source/blender/editors/physics/physics_ops.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_internal.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_opengl.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_preview.c
branches/soc-2010-leifandersen/source/blender/editors/render/render_shading.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_edit.c
branches/soc-2010-leifandersen/source/blender/editors/screen/screen_ops.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-leifandersen/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2010-leifandersen/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_intern.h
branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_window.c
branches/soc-2010-leifandersen/source/blender/editors/space_logic/space_logic.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/drawnode.c
branches/soc-2010-leifandersen/source/blender/editors/space_node/node_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2010-leifandersen/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_text/text_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_text/text_ops.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2010-leifandersen/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-leifandersen/source/blender/editors/transform/transform_generics.c
branches/soc-2010-leifandersen/source/blender/editors/util/ed_util.c
branches/soc-2010-leifandersen/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-leifandersen/source/blender/gpu/GPU_material.h
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_material.c
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2010-leifandersen/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/jpeg.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/thumbs.c
branches/soc-2010-leifandersen/source/blender/imbuf/intern/tiff.c
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_curve_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_image_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_scene_types.h
branches/soc-2010-leifandersen/source/blender/makesdna/DNA_smoke_types.h
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_boid.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_fluidsim.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-leifandersen/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-leifandersen/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-leifandersen/source/blender/nodes/intern/CMP_nodes/CMP_huecorrect.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils.h
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_quat.c
branches/soc-2010-leifandersen/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_interface.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.c
branches/soc-2010-leifandersen/source/blender/python/intern/bpy_rna.h
branches/soc-2010-leifandersen/source/blender/render/extern/include/RE_pipeline.h
branches/soc-2010-leifandersen/source/blender/render/intern/include/render_types.h
branches/soc-2010-leifandersen/source/blender/render/intern/include/renderdatabase.h
branches/soc-2010-leifandersen/source/blender/render/intern/include/texture.h
branches/soc-2010-leifandersen/source/blender/render/intern/source/convertblender.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/envmap.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/pipeline.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/pointdensity.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/rayshade.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/renderdatabase.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/shadeinput.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/shadeoutput.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/sss.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/texture.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/volumetric.c
branches/soc-2010-leifandersen/source/blender/render/intern/source/voxeldata.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-leifandersen/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2010-leifandersen/source/creator/creator.c
branches/soc-2010-leifandersen/source/darwin/Makefile
branches/soc-2010-leifandersen/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-leifandersen/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2010-leifandersen/source/gameengine/PyDoc/bge.types.rst
branches/soc-2010-leifandersen/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
Removed Paths:
-------------
branches/soc-2010-leifandersen/release/scripts/io/engine_render_pov.py
branches/soc-2010-leifandersen/release/scripts/ui/space_buttons.py
branches/soc-2010-leifandersen/source/blender/editors/space_logic/logic_header.c
Property Changed:
----------------
branches/soc-2010-leifandersen/release/scripts/io/netrender/repath.py
Modified: branches/soc-2010-leifandersen/build_files/scons/config/win32-vc-config.py
===================================================================
--- branches/soc-2010-leifandersen/build_files/scons/config/win32-vc-config.py 2010-08-02 03:30:07 UTC (rev 30964)
+++ branches/soc-2010-leifandersen/build_files/scons/config/win32-vc-config.py 2010-08-02 03:39:12 UTC (rev 30965)
@@ -130,7 +130,7 @@
BF_OPENJPEG_INC = '${BF_OPENJPEG}'
BF_OPENJPEG_LIBPATH='${BF_OPENJPEG}/lib'
-WITH_BF_FFTW3 = False
+WITH_BF_FFTW3 = True
BF_FFTW3 = LIBDIR + '/fftw3'
BF_FFTW3_INC = '${BF_FFTW3}/include'
BF_FFTW3_LIB = 'libfftw'
Modified: branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-08-02 03:30:07 UTC (rev 30964)
+++ branches/soc-2010-leifandersen/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-08-02 03:39:12 UTC (rev 30965)
@@ -1299,6 +1299,11 @@
NSArray *windowsList = [NSApp orderedWindows];
if ([windowsList count]) {
[[windowsList objectAtIndex:0] makeKeyAndOrderFront:nil];
+ //Handle the modifiers keyes changed state issue
+ //as recovering from the quit dialog is like application
+ //gaining focus back.
+ //Main issue fixed is Cmd modifier not being cleared
+ handleApplicationBecomeActiveEvent();
}
}
Modified: branches/soc-2010-leifandersen/intern/smoke/extern/smoke_API.h
===================================================================
--- branches/soc-2010-leifandersen/intern/smoke/extern/smoke_API.h 2010-08-02 03:30:07 UTC (rev 30964)
+++ branches/soc-2010-leifandersen/intern/smoke/extern/smoke_API.h 2010-08-02 03:39:12 UTC (rev 30965)
@@ -38,11 +38,11 @@
void smoke_export(struct FLUID_3D *fluid, float *dt, float *dx, float **dens, float **densold, float **heat, float **heatold, float **vx, float **vy, float **vz, float **vxold, float **vyold, float **vzold, unsigned char **obstacles);
// low res
-struct FLUID_3D *smoke_init(int *res, float *p0, float dt);
+struct FLUID_3D *smoke_init(int *res, float *p0);
void smoke_free(struct FLUID_3D *fluid);
-void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta);
-void smoke_step(struct FLUID_3D *fluid, size_t framenr);
+void smoke_initBlenderRNA(struct FLUID_3D *fluid, float *alpha, float *beta, float *dt_factor, float *vorticity, int *border_colli);
+void smoke_step(struct FLUID_3D *fluid, size_t framenr, float fps);
float *smoke_get_density(struct FLUID_3D *fluid);
float *smoke_get_heat(struct FLUID_3D *fluid);
Modified: branches/soc-2010-leifandersen/intern/smoke/intern/FLUID_3D.cpp
===================================================================
--- branches/soc-2010-leifandersen/intern/smoke/intern/FLUID_3D.cpp 2010-08-02 03:30:07 UTC (rev 30964)
+++ branches/soc-2010-leifandersen/intern/smoke/intern/FLUID_3D.cpp 2010-08-02 03:39:12 UTC (rev 30965)
@@ -35,23 +35,15 @@
#include <omp.h>
#endif // PARALLEL
-// boundary conditions of the fluid domain
-#define DOMAIN_BC_FRONT 0 // z
-#define DOMAIN_BC_TOP 1 // y
-#define DOMAIN_BC_LEFT 1 // x
-#define DOMAIN_BC_BACK DOMAIN_BC_FRONT
-#define DOMAIN_BC_BOTTOM DOMAIN_BC_TOP
-#define DOMAIN_BC_RIGHT DOMAIN_BC_LEFT
-
//////////////////////////////////////////////////////////////////////
// Construction/Destruction
//////////////////////////////////////////////////////////////////////
-FLUID_3D::FLUID_3D(int *res, float *p0, float dt) :
- _xRes(res[0]), _yRes(res[1]), _zRes(res[2]), _res(0.0f), _dt(dt)
+FLUID_3D::FLUID_3D(int *res, float *p0) :
+ _xRes(res[0]), _yRes(res[1]), _zRes(res[2]), _res(0.0f)
{
// set simulation consts
- // _dt = dt; // 0.10
+ _dt = DT_DEFAULT; // just in case. set in step from a RNA factor
// start point of array
_p0[0] = p0[0];
@@ -61,7 +53,6 @@
_iterations = 100;
_tempAmb = 0;
_heatDiffusion = 1e-3;
- _vorticityEps = 2.0;
_totalTime = 0.0f;
_totalSteps = 0;
_res = Vec3Int(_xRes,_yRes,_zRes);
@@ -77,9 +68,9 @@
// scale the constants according to the refinement of the grid
_dx = 1.0f / (float)_maxRes;
- float scaling = 64.0f / _maxRes;
- scaling = (scaling < 1.0f) ? 1.0f : scaling;
- _vorticityEps /= scaling;
+ _constantScaling = 64.0f / _maxRes;
+ _constantScaling = (_constantScaling < 1.0f) ? 1.0f : _constantScaling;
+ _vorticityEps = 2.0f / _constantScaling; // Just in case set a default value
// allocate arrays
_totalCells = _xRes * _yRes * _zRes;
@@ -126,30 +117,42 @@
_obstacles[x] = false;
}
+ // boundary conditions of the fluid domain
+ // set default values -> vertically non-colliding
+ _domainBcFront = true;
+ _domainBcTop = false;
+ _domainBcLeft = true;
+ _domainBcBack = _domainBcFront;
+ _domainBcBottom = _domainBcTop;
+ _domainBcRight = _domainBcLeft;
+
+ _colloPrev = 1; // default value
+
+
// set side obstacles
int index;
for (int y = 0; y < _yRes; y++)
for (int x = 0; x < _xRes; x++)
{
- // front slab
+ // bottom slab
index = x + y * _xRes;
- if(DOMAIN_BC_FRONT==1) _obstacles[index] = 1;
+ if(_domainBcBottom==1) _obstacles[index] = 1;
- // back slab
+ // top slab
index += _totalCells - _slabSize;
- if(DOMAIN_BC_BACK==1) _obstacles[index] = 1;
+ if(_domainBcTop==1) _obstacles[index] = 1;
}
for (int z = 0; z < _zRes; z++)
for (int x = 0; x < _xRes; x++)
{
- // bottom slab
+ // front slab
index = x + z * _slabSize;
- if(DOMAIN_BC_BOTTOM==1) _obstacles[index] = 1;
+ if(_domainBcFront==1) _obstacles[index] = 1;
- // top slab
+ // back slab
index += _slabSize - _xRes;
- if(DOMAIN_BC_TOP==1) _obstacles[index] = 1;
+ if(_domainBcBack==1) _obstacles[index] = 1;
}
for (int z = 0; z < _zRes; z++)
@@ -157,12 +160,13 @@
{
// left slab
index = y * _xRes + z * _slabSize;
- if(DOMAIN_BC_LEFT==1) _obstacles[index] = 1;
+ if(_domainBcLeft==1) _obstacles[index] = 1;
// right slab
index += _xRes - 1;
- if(DOMAIN_BC_RIGHT==1) _obstacles[index] = 1;
+ if(_domainBcRight==1) _obstacles[index] = 1;
}
+
}
FLUID_3D::~FLUID_3D()
@@ -193,17 +197,32 @@
}
// init direct access functions from blender
-void FLUID_3D::initBlenderRNA(float *alpha, float *beta)
+void FLUID_3D::initBlenderRNA(float *alpha, float *beta, float *dt_factor, float *vorticity, int *borderCollision)
{
_alpha = alpha;
_beta = beta;
+ _dtFactor = dt_factor;
+ _vorticityRNA = vorticity;
+ _borderColli = borderCollision;
}
//////////////////////////////////////////////////////////////////////
// step simulation once
//////////////////////////////////////////////////////////////////////
-void FLUID_3D::step()
+void FLUID_3D::step(float dt)
{
+ // If border rules have been changed
+ if (_colloPrev != *_borderColli) {
+ setBorderCollisions();
+ }
+
+
+ // set delta time by dt_factor
+ _dt = (*_dtFactor) * dt;
+ // set vorticity from RNA value
+ _vorticityEps = (*_vorticityRNA)/_constantScaling;
+
+
#if PARALLEL==1
int threadval = 1;
threadval = omp_get_max_threads();
@@ -246,6 +265,13 @@
#pragma omp single
{
#endif
+ /*
+ * addForce() changed Temp values to preserve thread safety
+ * (previous functions in per thread loop still needed
+ * original velocity data)
+ *
+ * So swap temp values to velocity
+ */
SWAP_POINTERS(_xVelocity, _xVelocityTemp);
SWAP_POINTERS(_yVelocity, _yVelocityTemp);
SWAP_POINTERS(_zVelocity, _zVelocityTemp);
@@ -276,6 +302,10 @@
#pragma omp single
{
#endif
+ /*
+ * For thread safety use "Old" to read
+ * "current" values but still allow changing values.
+ */
SWAP_POINTERS(_xVelocity, _xVelocityOld);
SWAP_POINTERS(_yVelocity, _yVelocityOld);
SWAP_POINTERS(_zVelocity, _zVelocityOld);
@@ -334,6 +364,10 @@
}
#endif
+ /*
+ * swap final velocity back to Velocity array
+ * from temp xForce storage
+ */
SWAP_POINTERS(_xVelocity, _xForce);
SWAP_POINTERS(_yVelocity, _yForce);
SWAP_POINTERS(_zVelocity, _zForce);
@@ -351,6 +385,88 @@
}
+
+// Set border collision model from RNA setting
+
+void FLUID_3D::setBorderCollisions() {
+
+
+ _colloPrev = *_borderColli; // saving the current value
+
+ // boundary conditions of the fluid domain
+ if (_colloPrev == 0)
+ {
+ // No collisions
+ _domainBcFront = false;
+ _domainBcTop = false;
+ _domainBcLeft = false;
+ }
+ else if (_colloPrev == 2)
+ {
+ // Collide with all sides
+ _domainBcFront = true;
+ _domainBcTop = true;
+ _domainBcLeft = true;
+ }
+ else
+ {
+ // Default values: Collide with "walls", but not top and bottom
+ _domainBcFront = true;
+ _domainBcTop = false;
+ _domainBcLeft = true;
+ }
+
+ _domainBcBack = _domainBcFront;
+ _domainBcBottom = _domainBcTop;
+ _domainBcRight = _domainBcLeft;
+
+
+
+ // set side obstacles
+ int index;
+ for (int y = 0; y < _yRes; y++)
+ for (int x = 0; x < _xRes; x++)
+ {
+ // front slab
+ index = x + y * _xRes;
+ if(_domainBcBottom==1) _obstacles[index] = 1;
+ else _obstacles[index] = 0;
+
+ // back slab
+ index += _totalCells - _slabSize;
+ if(_domainBcTop==1) _obstacles[index] = 1;
+ else _obstacles[index] = 0;
+ }
+
+ for (int z = 0; z < _zRes; z++)
+ for (int x = 0; x < _xRes; x++)
+ {
+ // bottom slab
+ index = x + z * _slabSize;
+ if(_domainBcFront==1) _obstacles[index] = 1;
+ else _obstacles[index] = 0;
+
+ // top slab
+ index += _slabSize - _xRes;
+ if(_domainBcBack==1) _obstacles[index] = 1;
+ else _obstacles[index] = 0;
+ }
+
+ for (int z = 0; z < _zRes; z++)
+ for (int y = 0; y < _yRes; y++)
+ {
+ // left slab
+ index = y * _xRes + z * _slabSize;
+ if(_domainBcLeft==1) _obstacles[index] = 1;
+ else _obstacles[index] = 0;
+
+ // right slab
+ index += _xRes - 1;
+ if(_domainBcRight==1) _obstacles[index] = 1;
+ else _obstacles[index] = 0;
+ }
+}
+
//////////////////////////////////////////////////////////////////////
// helper function to dampen co-located grid artifacts of given arrays in intervals
// (only needed for velocity, strength (w) depends on testcase...
@@ -428,6 +544,10 @@
for (y = 1; y < _res[1]-1; y++)
for (x = 1+(y+z)%2; x < _res[0]-1; x+=2) {
index = x + y*_res[0] + posslab;
+ /*
+ * Uses xForce as temporary storage to allow other threads to read
+ * old values from xVelocityTemp
+ */
_xForce[index] = (1-w)*_xVelocityTemp[index] + 1./6. * w*(
_xVelocityTemp[index+1] + _xVelocityTemp[index-1] +
_xVelocityTemp[index+_res[0]] + _xVelocityTemp[index-_res[0]] +
@@ -450,6 +570,11 @@
for (y = 1; y < _res[1]-1; y++)
for (x = 1+(y+z+1)%2; x < _res[0]-1; x+=2) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list