[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [26367] branches/render25: svn merge https ://svn.blender.org/svnroot/bf-blender/trunk/blender -r26191:26366
Brecht Van Lommel
brecht at blender.org
Thu Jan 28 17:02:28 CET 2010
Revision: 26367
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=26367
Author: blendix
Date: 2010-01-28 17:02:26 +0100 (Thu, 28 Jan 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r26191:26366
Modified Paths:
--------------
branches/render25/intern/ghost/GHOST_Types.h
branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/render25/intern/ghost/intern/GHOST_WindowCarbon.cpp
branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/render25/intern/ghost/intern/GHOST_WindowX11.cpp
branches/render25/intern/guardedalloc/intern/mallocn.c
branches/render25/intern/smoke/intern/EIGENVALUE_HELPER.h
branches/render25/intern/smoke/intern/FLUID_3D.cpp
branches/render25/intern/smoke/intern/FLUID_3D.h
branches/render25/intern/smoke/intern/FLUID_3D_SOLVERS.cpp
branches/render25/intern/smoke/intern/FLUID_3D_STATIC.cpp
branches/render25/intern/smoke/intern/LU_HELPER.h
branches/render25/intern/smoke/intern/WTURBULENCE.cpp
branches/render25/intern/smoke/intern/smoke_API.cpp
branches/render25/intern/smoke/make/msvc_9_0/smoke.vcproj
branches/render25/projectfiles_vc9/blender/BPY_python/BPY_python.vcproj
branches/render25/projectfiles_vc9/blender/blenlib/BLI_blenlib.vcproj
branches/render25/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/render25/projectfiles_vc9/blender/nodes/nodes.vcproj
branches/render25/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
branches/render25/release/scripts/io/engine_render_pov.py
branches/render25/release/scripts/io/export_3ds.py
branches/render25/release/scripts/io/export_fbx.py
branches/render25/release/scripts/io/export_mdd.py
branches/render25/release/scripts/io/export_obj.py
branches/render25/release/scripts/io/export_ply.py
branches/render25/release/scripts/io/export_x3d.py
branches/render25/release/scripts/io/import_anim_bvh.py
branches/render25/release/scripts/io/netrender/master.py
branches/render25/release/scripts/io/netrender/master_html.py
branches/render25/release/scripts/io/netrender/utils.py
branches/render25/release/scripts/modules/bpy/__init__.py
branches/render25/release/scripts/modules/bpy/app.py
branches/render25/release/scripts/modules/bpy/ops.py
branches/render25/release/scripts/modules/bpy/utils.py
branches/render25/release/scripts/modules/bpy_types.py
branches/render25/release/scripts/modules/rigify/__init__.py
branches/render25/release/scripts/modules/rigify/arm_biped.py
branches/render25/release/scripts/modules/rigify/delta.py
branches/render25/release/scripts/modules/rigify/leg_biped.py
branches/render25/release/scripts/modules/rigify/leg_quadruped.py
branches/render25/release/scripts/modules/rigify/mouth.py
branches/render25/release/scripts/modules/rigify/palm_curl.py
branches/render25/release/scripts/modules/rigify/shape_key_rotdiff.py
branches/render25/release/scripts/modules/rigify/spine_pivot_flex.py
branches/render25/release/scripts/modules/rigify_utils.py
branches/render25/release/scripts/modules/rna_info.py
branches/render25/release/scripts/op/mesh.py
branches/render25/release/scripts/op/object.py
branches/render25/release/scripts/op/uv.py
branches/render25/release/scripts/op/uvcalc_smart_project.py
branches/render25/release/scripts/templates/gamelogic.py
branches/render25/release/scripts/ui/properties_data_armature.py
branches/render25/release/scripts/ui/properties_data_lamp.py
branches/render25/release/scripts/ui/properties_physics_smoke.py
branches/render25/release/scripts/ui/properties_render.py
branches/render25/release/scripts/ui/properties_scene.py
branches/render25/release/scripts/ui/properties_texture.py
branches/render25/release/scripts/ui/properties_world.py
branches/render25/release/scripts/ui/space_info.py
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/release/scripts/ui/space_userpref.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/Makefile
branches/render25/source/blender/blenkernel/BKE_DerivedMesh.h
branches/render25/source/blender/blenkernel/BKE_animsys.h
branches/render25/source/blender/blenkernel/BKE_blender.h
branches/render25/source/blender/blenkernel/BKE_deform.h
branches/render25/source/blender/blenkernel/BKE_fcurve.h
branches/render25/source/blender/blenkernel/BKE_image.h
branches/render25/source/blender/blenkernel/BKE_modifier.h
branches/render25/source/blender/blenkernel/BKE_nla.h
branches/render25/source/blender/blenkernel/BKE_screen.h
branches/render25/source/blender/blenkernel/BKE_utildefines.h
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/anim_sys.c
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/boids.c
branches/render25/source/blender/blenkernel/intern/colortools.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/context.c
branches/render25/source/blender/blenkernel/intern/curve.c
branches/render25/source/blender/blenkernel/intern/deform.c
branches/render25/source/blender/blenkernel/intern/depsgraph.c
branches/render25/source/blender/blenkernel/intern/effect.c
branches/render25/source/blender/blenkernel/intern/fcurve.c
branches/render25/source/blender/blenkernel/intern/image.c
branches/render25/source/blender/blenkernel/intern/ipo.c
branches/render25/source/blender/blenkernel/intern/material.c
branches/render25/source/blender/blenkernel/intern/modifier.c
branches/render25/source/blender/blenkernel/intern/multires.c
branches/render25/source/blender/blenkernel/intern/nla.c
branches/render25/source/blender/blenkernel/intern/node.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/scene.c
branches/render25/source/blender/blenkernel/intern/shrinkwrap.c
branches/render25/source/blender/blenkernel/intern/simple_deform.c
branches/render25/source/blender/blenkernel/intern/smoke.c
branches/render25/source/blender/blenkernel/intern/softbody.c
branches/render25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/render25/source/blender/blenkernel/intern/text.c
branches/render25/source/blender/blenkernel/intern/unit.c
branches/render25/source/blender/blenkernel/intern/world.c
branches/render25/source/blender/blenkernel/intern/writeavi.c
branches/render25/source/blender/blenkernel/intern/writeffmpeg.c
branches/render25/source/blender/blenlib/BLI_ghash.h
branches/render25/source/blender/blenlib/BLI_math_inline.h
branches/render25/source/blender/blenlib/BLI_path_util.h
branches/render25/source/blender/blenlib/BLI_storage_types.h
branches/render25/source/blender/blenlib/BLI_string.h
branches/render25/source/blender/blenlib/BLI_winstuff.h
branches/render25/source/blender/blenlib/intern/BLI_ghash.c
branches/render25/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/render25/source/blender/blenlib/intern/math_base_inline.c
branches/render25/source/blender/blenlib/intern/math_rotation.c
branches/render25/source/blender/blenlib/intern/path_util.c
branches/render25/source/blender/blenlib/intern/storage.c
branches/render25/source/blender/blenlib/intern/string.c
branches/render25/source/blender/blenlib/intern/threads.c
branches/render25/source/blender/blenloader/intern/readfile.c
branches/render25/source/blender/blenloader/intern/undofile.c
branches/render25/source/blender/blenloader/intern/writefile.c
branches/render25/source/blender/collada/DocumentImporter.cpp
branches/render25/source/blender/editors/animation/anim_channels_defines.c
branches/render25/source/blender/editors/animation/anim_channels_edit.c
branches/render25/source/blender/editors/animation/anim_draw.c
branches/render25/source/blender/editors/animation/anim_filter.c
branches/render25/source/blender/editors/animation/keyframes_draw.c
branches/render25/source/blender/editors/animation/keyframes_edit.c
branches/render25/source/blender/editors/animation/keyframing.c
branches/render25/source/blender/editors/animation/keyingsets.c
branches/render25/source/blender/editors/armature/armature_intern.h
branches/render25/source/blender/editors/armature/armature_ops.c
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/armature/meshlaplacian.c
branches/render25/source/blender/editors/armature/poseSlide.c
branches/render25/source/blender/editors/armature/poselib.c
branches/render25/source/blender/editors/armature/poseobject.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/curve/editfont.c
branches/render25/source/blender/editors/include/ED_anim_api.h
branches/render25/source/blender/editors/include/ED_armature.h
branches/render25/source/blender/editors/include/ED_mesh.h
branches/render25/source/blender/editors/include/ED_view3d.h
branches/render25/source/blender/editors/include/UI_interface.h
branches/render25/source/blender/editors/interface/interface.c
branches/render25/source/blender/editors/interface/interface_anim.c
branches/render25/source/blender/editors/interface/interface_draw.c
branches/render25/source/blender/editors/interface/interface_handlers.c
branches/render25/source/blender/editors/interface/interface_icons.c
branches/render25/source/blender/editors/interface/interface_intern.h
branches/render25/source/blender/editors/interface/interface_layout.c
branches/render25/source/blender/editors/interface/interface_regions.c
branches/render25/source/blender/editors/interface/interface_templates.c
branches/render25/source/blender/editors/interface/interface_widgets.c
branches/render25/source/blender/editors/interface/view2d.c
branches/render25/source/blender/editors/mesh/editmesh.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/loopcut.c
branches/render25/source/blender/editors/mesh/mesh_data.c
branches/render25/source/blender/editors/mesh/mesh_intern.h
branches/render25/source/blender/editors/mesh/mesh_ops.c
branches/render25/source/blender/editors/object/object_add.c
branches/render25/source/blender/editors/object/object_edit.c
branches/render25/source/blender/editors/object/object_group.c
branches/render25/source/blender/editors/object/object_intern.h
branches/render25/source/blender/editors/object/object_modifier.c
branches/render25/source/blender/editors/object/object_ops.c
branches/render25/source/blender/editors/object/object_relations.c
branches/render25/source/blender/editors/object/object_vgroup.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/screen/area.c
branches/render25/source/blender/editors/screen/screen_edit.c
branches/render25/source/blender/editors/screen/screen_ops.c
branches/render25/source/blender/editors/screen/screendump.c
branches/render25/source/blender/editors/sculpt_paint/paint_intern.h
branches/render25/source/blender/editors/sculpt_paint/paint_ops.c
branches/render25/source/blender/editors/sculpt_paint/paint_vertex.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/sculpt_paint/sculpt_intern.h
branches/render25/source/blender/editors/sound/sound_ops.c
branches/render25/source/blender/editors/space_action/action_edit.c
branches/render25/source/blender/editors/space_action/action_select.c
branches/render25/source/blender/editors/space_action/space_action.c
branches/render25/source/blender/editors/space_api/spacetypes.c
branches/render25/source/blender/editors/space_buttons/buttons_context.c
branches/render25/source/blender/editors/space_buttons/buttons_ops.c
branches/render25/source/blender/editors/space_buttons/space_buttons.c
branches/render25/source/blender/editors/space_console/space_console.c
branches/render25/source/blender/editors/space_file/file_draw.c
branches/render25/source/blender/editors/space_file/file_ops.c
branches/render25/source/blender/editors/space_file/filelist.c
branches/render25/source/blender/editors/space_file/filelist.h
branches/render25/source/blender/editors/space_file/space_file.c
branches/render25/source/blender/editors/space_graph/graph_draw.c
branches/render25/source/blender/editors/space_graph/graph_edit.c
branches/render25/source/blender/editors/space_graph/graph_select.c
branches/render25/source/blender/editors/space_graph/graph_utils.c
branches/render25/source/blender/editors/space_graph/space_graph.c
branches/render25/source/blender/editors/space_image/image_draw.c
branches/render25/source/blender/editors/space_image/image_ops.c
branches/render25/source/blender/editors/space_image/space_image.c
branches/render25/source/blender/editors/space_info/info_ops.c
branches/render25/source/blender/editors/space_info/space_info.c
branches/render25/source/blender/editors/space_logic/logic_buttons.c
branches/render25/source/blender/editors/space_logic/logic_window.c
branches/render25/source/blender/editors/space_logic/space_logic.c
branches/render25/source/blender/editors/space_nla/nla_buttons.c
branches/render25/source/blender/editors/space_nla/nla_channels.c
branches/render25/source/blender/editors/space_nla/nla_edit.c
branches/render25/source/blender/editors/space_nla/nla_intern.h
branches/render25/source/blender/editors/space_nla/nla_ops.c
branches/render25/source/blender/editors/space_nla/nla_select.c
branches/render25/source/blender/editors/space_nla/space_nla.c
branches/render25/source/blender/editors/space_node/drawnode.c
branches/render25/source/blender/editors/space_node/node_draw.c
branches/render25/source/blender/editors/space_node/space_node.c
branches/render25/source/blender/editors/space_outliner/outliner.c
branches/render25/source/blender/editors/space_outliner/space_outliner.c
branches/render25/source/blender/editors/space_script/space_script.c
branches/render25/source/blender/editors/space_sequencer/sequencer_add.c
branches/render25/source/blender/editors/space_sequencer/space_sequencer.c
branches/render25/source/blender/editors/space_sound/space_sound.c
branches/render25/source/blender/editors/space_text/space_text.c
branches/render25/source/blender/editors/space_text/text_draw.c
branches/render25/source/blender/editors/space_text/text_intern.h
branches/render25/source/blender/editors/space_text/text_ops.c
branches/render25/source/blender/editors/space_text/text_python.c
branches/render25/source/blender/editors/space_time/space_time.c
branches/render25/source/blender/editors/space_userpref/space_userpref.c
branches/render25/source/blender/editors/space_view3d/drawanimviz.c
branches/render25/source/blender/editors/space_view3d/drawarmature.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/space_view3d.c
branches/render25/source/blender/editors/space_view3d/view3d_buttons.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_select.c
branches/render25/source/blender/editors/space_view3d/view3d_snap.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform.h
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_numinput.c
branches/render25/source/blender/editors/util/editmode_undo.c
branches/render25/source/blender/ikplugin/intern/iksolver_plugin.c
branches/render25/source/blender/imbuf/intern/anim.c
branches/render25/source/blender/imbuf/intern/anim5.c
branches/render25/source/blender/makesdna/DNA_action_types.h
branches/render25/source/blender/makesdna/DNA_anim_types.h
branches/render25/source/blender/makesdna/DNA_color_types.h
branches/render25/source/blender/makesdna/DNA_lamp_types.h
branches/render25/source/blender/makesdna/DNA_modifier_types.h
branches/render25/source/blender/makesdna/DNA_scene_types.h
branches/render25/source/blender/makesdna/DNA_screen_types.h
branches/render25/source/blender/makesdna/DNA_smoke_types.h
branches/render25/source/blender/makesdna/DNA_space_types.h
branches/render25/source/blender/makesdna/DNA_texture_types.h
branches/render25/source/blender/makesdna/DNA_vec_types.h
branches/render25/source/blender/makesdna/DNA_windowmanager_types.h
branches/render25/source/blender/makesdna/DNA_world_types.h
branches/render25/source/blender/makesdna/intern/makesdna.c
branches/render25/source/blender/makesrna/RNA_access.h
branches/render25/source/blender/makesrna/RNA_define.h
branches/render25/source/blender/makesrna/RNA_enum_types.h
branches/render25/source/blender/makesrna/RNA_types.h
branches/render25/source/blender/makesrna/intern/CMakeLists.txt
branches/render25/source/blender/makesrna/intern/makesrna.c
branches/render25/source/blender/makesrna/intern/rna_access.c
branches/render25/source/blender/makesrna/intern/rna_action.c
branches/render25/source/blender/makesrna/intern/rna_action_api.c
branches/render25/source/blender/makesrna/intern/rna_brush.c
branches/render25/source/blender/makesrna/intern/rna_camera.c
branches/render25/source/blender/makesrna/intern/rna_constraint.c
branches/render25/source/blender/makesrna/intern/rna_curve.c
branches/render25/source/blender/makesrna/intern/rna_define.c
branches/render25/source/blender/makesrna/intern/rna_fcurve.c
branches/render25/source/blender/makesrna/intern/rna_gpencil.c
branches/render25/source/blender/makesrna/intern/rna_internal.h
branches/render25/source/blender/makesrna/intern/rna_lamp.c
branches/render25/source/blender/makesrna/intern/rna_modifier.c
branches/render25/source/blender/makesrna/intern/rna_nla.c
branches/render25/source/blender/makesrna/intern/rna_nodetree.c
branches/render25/source/blender/makesrna/intern/rna_object.c
branches/render25/source/blender/makesrna/intern/rna_object_api.c
branches/render25/source/blender/makesrna/intern/rna_particle.c
branches/render25/source/blender/makesrna/intern/rna_pose.c
branches/render25/source/blender/makesrna/intern/rna_render.c
branches/render25/source/blender/makesrna/intern/rna_rna.c
branches/render25/source/blender/makesrna/intern/rna_scene.c
branches/render25/source/blender/makesrna/intern/rna_scene_api.c
branches/render25/source/blender/makesrna/intern/rna_smoke.c
branches/render25/source/blender/makesrna/intern/rna_texture.c
branches/render25/source/blender/makesrna/intern/rna_ui_api.c
branches/render25/source/blender/makesrna/intern/rna_wm.c
branches/render25/source/blender/makesrna/intern/rna_world.c
branches/render25/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/render25/source/blender/python/generic/Geometry.c
branches/render25/source/blender/python/generic/Mathutils.c
branches/render25/source/blender/python/generic/Mathutils.h
branches/render25/source/blender/python/generic/euler.c
branches/render25/source/blender/python/generic/matrix.c
branches/render25/source/blender/python/generic/quat.c
branches/render25/source/blender/python/generic/vector.c
branches/render25/source/blender/python/intern/bpy_array.c
branches/render25/source/blender/python/intern/bpy_operator.c
branches/render25/source/blender/python/intern/bpy_rna.c
branches/render25/source/blender/python/intern/bpy_rna.h
branches/render25/source/blender/python/sphinx_doc_gen.py
branches/render25/source/blender/quicktime/apple/qtkit_export.m
branches/render25/source/blender/quicktime/apple/qtkit_import.m
branches/render25/source/blender/quicktime/apple/quicktime_import.c
branches/render25/source/blender/render/extern/include/RE_shader_ext.h
branches/render25/source/blender/render/intern/include/object_strand.h
branches/render25/source/blender/render/intern/include/raytrace.h
branches/render25/source/blender/render/intern/source/bake.c
branches/render25/source/blender/render/intern/source/diskocclusion.c
branches/render25/source/blender/render/intern/source/object_strand.c
branches/render25/source/blender/render/intern/source/rayshade.c
branches/render25/source/blender/render/intern/source/result.c
branches/render25/source/blender/render/intern/source/shadeinput.c
branches/render25/source/blender/render/intern/source/shadeoutput.c
branches/render25/source/blender/render/intern/source/texture_stack.c
branches/render25/source/blender/render/intern/source/texture_voxeldata.c
branches/render25/source/blender/windowmanager/WM_api.h
branches/render25/source/blender/windowmanager/WM_types.h
branches/render25/source/blender/windowmanager/intern/wm.c
branches/render25/source/blender/windowmanager/intern/wm_cursors.c
branches/render25/source/blender/windowmanager/intern/wm_draw.c
branches/render25/source/blender/windowmanager/intern/wm_event_system.c
branches/render25/source/blender/windowmanager/intern/wm_files.c
branches/render25/source/blender/windowmanager/intern/wm_gesture.c
branches/render25/source/blender/windowmanager/intern/wm_init_exit.c
branches/render25/source/blender/windowmanager/intern/wm_keymap.c
branches/render25/source/blender/windowmanager/intern/wm_operators.c
branches/render25/source/blender/windowmanager/intern/wm_window.c
branches/render25/source/blender/windowmanager/wm_cursors.h
branches/render25/source/blender/windowmanager/wm_event_system.h
branches/render25/source/blender/windowmanager/wm_event_types.h
branches/render25/source/creator/CMakeLists.txt
branches/render25/source/creator/creator.c
branches/render25/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/render25/source/nan_compile.mk
branches/render25/source/nan_definitions.mk
Added Paths:
-----------
branches/render25/intern/smoke/intern/EIGENVALUE_HELPER.cpp
branches/render25/intern/smoke/intern/LU_HELPER.cpp
branches/render25/release/scripts/templates/panel_simple.py
branches/render25/source/blender/python/doc/epy/
branches/render25/source/blender/python/doc/epy/BGL.py
branches/render25/source/blender/python/doc/epy/Geometry.py
branches/render25/source/blender/python/doc/epy/IDProp.py
branches/render25/source/blender/python/doc/epy/Mathutils.py
branches/render25/source/blender/python/doc/epy/testbgl.py
branches/render25/source/blender/windowmanager/intern/wm_dragdrop.c
Removed Paths:
-------------
branches/render25/release/scripts/modules/retopo.py
branches/render25/release/scripts/op/mesh_skin.py
branches/render25/source/blender/editors/include/ED_interface.h
branches/render25/source/blender/python/doc/epy/BGL.py
branches/render25/source/blender/python/doc/epy/Geometry.py
branches/render25/source/blender/python/doc/epy/IDProp.py
branches/render25/source/blender/python/doc/epy/Mathutils.py
branches/render25/source/blender/python/doc/epy/testbgl.py
branches/render25/source/blender/render/intern/include/occlusion.h
Property Changed:
----------------
branches/render25/source/blender/blenlib/BLI_math_inline.h
branches/render25/source/blender/blenlib/intern/math_base_inline.c
Modified: branches/render25/intern/ghost/GHOST_Types.h
===================================================================
--- branches/render25/intern/ghost/GHOST_Types.h 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/ghost/GHOST_Types.h 2010-01-28 16:02:26 UTC (rev 26367)
@@ -204,6 +204,7 @@
GHOST_kStandardCursorTopRightCorner,
GHOST_kStandardCursorBottomRightCorner,
GHOST_kStandardCursorBottomLeftCorner,
+ GHOST_kStandardCursorCopy,
GHOST_kStandardCursorCustom,
GHOST_kStandardCursorNumCursors,
GHOST_kStandardCursorPencil
Modified: branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/ghost/intern/GHOST_SystemCocoa.mm 2010-01-28 16:02:26 UTC (rev 26367)
@@ -1002,6 +1002,9 @@
case GHOST_kEventWindowUpdate:
pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowUpdate, window) );
break;
+ case GHOST_kEventWindowMove:
+ pushEvent( new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowMove, window) );
+ break;
case GHOST_kEventWindowSize:
if (!m_ignoreWindowSizedMessages)
{
Modified: branches/render25/intern/ghost/intern/GHOST_WindowCarbon.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_WindowCarbon.cpp 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/ghost/intern/GHOST_WindowCarbon.cpp 2010-01-28 16:02:26 UTC (rev 26367)
@@ -635,6 +635,7 @@
GCMAP( GHOST_kStandardCursorTopRightCorner, kThemeArrowCursor);
GCMAP( GHOST_kStandardCursorBottomRightCorner, kThemeArrowCursor);
GCMAP( GHOST_kStandardCursorBottomLeftCorner, kThemeArrowCursor);
+ GCMAP( GHOST_kStandardCursorCopy, kThemeCopyArrowCursor);
};
#undef GCMAP
Modified: branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/ghost/intern/GHOST_WindowCocoa.mm 2010-01-28 16:02:26 UTC (rev 26367)
@@ -72,6 +72,8 @@
- (void)windowDidResignKey:(NSNotification *)notification;
- (void)windowDidExpose:(NSNotification *)notification;
- (void)windowDidResize:(NSNotification *)notification;
+- (void)windowDidMove:(NSNotification *)notification;
+- (void)windowWillMove:(NSNotification *)notification;
@end
@implementation CocoaWindowDelegate : NSObject
@@ -101,6 +103,16 @@
systemCocoa->handleWindowEvent(GHOST_kEventWindowUpdate, associatedWindow);
}
+- (void)windowDidMove:(NSNotification *)notification
+{
+ systemCocoa->handleWindowEvent(GHOST_kEventWindowMove, associatedWindow);
+}
+
+- (void)windowWillMove:(NSNotification *)notification
+{
+ systemCocoa->handleWindowEvent(GHOST_kEventWindowMove, associatedWindow);
+}
+
- (void)windowDidResize:(NSNotification *)notification
{
#ifdef MAC_OS_X_VERSION_10_6
@@ -324,6 +336,11 @@
// Pixel Format Attributes for the windowed NSOpenGLContext
i=0;
pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
+
+ // Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object’s flushBuffer
+ // needed for 'Draw Overlap' drawing method
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
+
pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
//pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
@@ -354,6 +371,11 @@
if (pixelFormat == nil) {
i=0;
pixelFormatAttrsWindow[i++] = NSOpenGLPFADoubleBuffer;
+
+ // Guarantees the back buffer contents to be valid after a call to NSOpenGLContext object’s flushBuffer
+ // needed for 'Draw Overlap' drawing method
+ pixelFormatAttrsWindow[i++] = NSOpenGLPFABackingStore;
+
pixelFormatAttrsWindow[i++] = NSOpenGLPFAAccelerated;
//pixelFormatAttrsWindow[i++] = NSOpenGLPFAAllowOfflineRenderers,; // Removed to allow 10.4 builds, and 2 GPUs rendering is not used anyway
@@ -1042,6 +1064,7 @@
case GHOST_kStandardCursorTopRightCorner:
case GHOST_kStandardCursorBottomRightCorner:
case GHOST_kStandardCursorBottomLeftCorner:
+ case GHOST_kStandardCursorCopy:
case GHOST_kStandardCursorDefault:
default:
tmpCursor = [NSCursor arrowCursor];
Modified: branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/ghost/intern/GHOST_WindowWin32.cpp 2010-01-28 16:02:26 UTC (rev 26367)
@@ -821,6 +821,7 @@
case GHOST_kStandardCursorBottomRightCorner: id = IDC_SIZENWSE; break;
case GHOST_kStandardCursorBottomLeftCorner: id = IDC_SIZENESW; break;
case GHOST_kStandardCursorPencil: id = IDC_ARROW; break;
+ case GHOST_kStandardCursorCopy: id = IDC_ARROW; break;
default:
success = false;
}
Modified: branches/render25/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/render25/intern/ghost/intern/GHOST_WindowX11.cpp 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/ghost/intern/GHOST_WindowX11.cpp 2010-01-28 16:02:26 UTC (rev 26367)
@@ -1359,6 +1359,7 @@
GtoX(GHOST_kStandardCursorBottomRightCorner, XC_bottom_right_corner); break;
GtoX(GHOST_kStandardCursorBottomLeftCorner, XC_bottom_left_corner); break;
GtoX(GHOST_kStandardCursorPencil, XC_pencil); break;
+ GtoX(GHOST_kStandardCursorCopy, XC_arrow); break;
default:
xcursor_id = 0;
}
Modified: branches/render25/intern/guardedalloc/intern/mallocn.c
===================================================================
--- branches/render25/intern/guardedalloc/intern/mallocn.c 2010-01-28 12:16:35 UTC (rev 26366)
+++ branches/render25/intern/guardedalloc/intern/mallocn.c 2010-01-28 16:02:26 UTC (rev 26367)
@@ -37,8 +37,6 @@
#include <string.h> /* memcpy */
#include <stdarg.h>
-#include "../../../source/blender/blenlib/BLI_mempool.h"
-
/* mmap exception */
#if defined(WIN32)
#include <sys/types.h>
@@ -140,40 +138,6 @@
/* implementation */
/* --------------------------------------------------------------------- */
-#ifdef OPTIMIZE_SMALL_BLOCKS
-
-/*allocator for small objects
-
- basic strategy: most slowdowns from overuse of the system allocator tends
- to be from relatively small allocations.
-*/
-
-/*this is a little bit bigger then it perhaps needs to be, to accomodate vgroup
- allocations (which are one system alloc per vertex of a mesh, and is a major
- source of performance loss)*/
-#define SMALL_BLOCK_LIMIT 1024
-#define POOL_CHUNK_SIZE 512 /*size in number of elements, not bytes*/
-
-static BLI_mempool *alloc_pools[SMALL_BLOCK_LIMIT+sizeof(MemHead)+sizeof(MemTail)] = {NULL,};
-
-static void *mempool_alloc_mem(int size) {
- size += sizeof(MemHead)+sizeof(MemTail);
-
- if (!alloc_pools[size]) {
- alloc_pools[size] = BLI_mempool_create(size, 1, POOL_CHUNK_SIZE, 1);
- }
-
- return BLI_mempool_alloc(alloc_pools[size]);
-}
-
-static void mempool_free(void *mem, int size) {
- size += sizeof(MemHead)+sizeof(MemTail);
-
- BLI_mempool_free(alloc_pools[size], mem);
-}
-
-#endif
-
static void print_error(const char *str, ...)
{
char buf[1024];
@@ -290,14 +254,7 @@
len = (len + 3 ) & ~3; /* allocate in units of 4 */
-#ifdef OPTIMIZE_SMALL_BLOCKS
- if (len < SMALL_BLOCK_LIMIT)
- memh= mempool_alloc_mem(len);
- else
- memh= (MemHead *)malloc(len+sizeof(MemHead)+sizeof(MemTail));
-#else
memh= (MemHead *)malloc(len+sizeof(MemHead)+sizeof(MemTail));
-#endif
if(memh) {
make_memhead_header(memh, len, str);
@@ -319,16 +276,7 @@
len = (len + 3 ) & ~3; /* allocate in units of 4 */
-#ifdef OPTIMIZE_SMALL_BLOCKS
- if (len < SMALL_BLOCK_LIMIT) {
- memh= mempool_alloc_mem(len);
- memset(memh, 0, len+sizeof(MemHead)+sizeof(MemTail));
- } else {
- memh= (MemHead *)calloc(len+sizeof(MemHead)+sizeof(MemTail),1);
- }
-#else
memh= (MemHead *)calloc(len+sizeof(MemHead)+sizeof(MemTail),1);
-#endif
if(memh) {
make_memhead_header(memh, len, str);
@@ -682,13 +630,8 @@
mmap_in_use -= memh->len;
if (munmap(memh, memh->len + sizeof(MemHead) + sizeof(MemTail)))
printf("Couldn't unmap memory %s\n", memh->name);
- }
-#ifdef OPTIMIZE_SMALL_BLOCKS
- else if (memh->len < SMALL_BLOCK_LIMIT) {
- mempool_free(memh, memh->len);
- }
-#endif
- else {
+ }
+ else {
if(malloc_debug_memset && memh->len)
memset(memh+1, 255, memh->len);
free(memh);
Copied: branches/render25/intern/smoke/intern/EIGENVALUE_HELPER.cpp (from rev 26366, trunk/blender/intern/smoke/intern/EIGENVALUE_HELPER.cpp)
===================================================================
--- branches/render25/intern/smoke/intern/EIGENVALUE_HELPER.cpp (rev 0)
+++ branches/render25/intern/smoke/intern/EIGENVALUE_HELPER.cpp 2010-01-28 16:02:26 UTC (rev 26367)
@@ -0,0 +1,885 @@
+
+#include "EIGENVALUE_HELPER.h"
+
+
+void Eigentred2(sEigenvalue& eval) {
+
+ // This is derived from the Algol procedures tred2 by
+ // Bowdler, Martin, Reinsch, and Wilkinson, Handbook for
+ // Auto. Comp., Vol.ii-Linear Algebra, and the corresponding
+ // Fortran subroutine in EISPACK.
+
+ int n=eval.n;
+
+ for (int j = 0; j < n; j++) {
+ eval.d[j] = eval.V[n-1][j];
+ }
+
+ // Householder reduction to tridiagonal form.
+
+ for (int i = n-1; i > 0; i--) {
+
+ // Scale to avoid under/overflow.
+
+ float scale = 0.0;
+ float h = 0.0;
+ for (int k = 0; k < i; k++) {
+ scale = scale + fabs(eval.d[k]);
+ }
+ if (scale == 0.0) {
+ eval.e[i] = eval.d[i-1];
+ for (int j = 0; j < i; j++) {
+ eval.d[j] = eval.V[i-1][j];
+ eval.V[i][j] = 0.0;
+ eval.V[j][i] = 0.0;
+ }
+ } else {
+
+ // Generate Householder vector.
+
+ for (int k = 0; k < i; k++) {
+ eval.d[k] /= scale;
+ h += eval.d[k] * eval.d[k];
+ }
+ float f = eval.d[i-1];
+ float g = sqrt(h);
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list