[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24078] branches/soc-2008-mxcurioni: merged changes to revision 24077
Maxime Curioni
maxime.curioni at gmail.com
Sun Oct 25 11:43:03 CET 2009
Revision: 24078
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24078
Author: mxcurioni
Date: 2009-10-25 11:43:03 +0100 (Sun, 25 Oct 2009)
Log Message:
-----------
merged changes to revision 24077
Revision Links:
--------------
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24077
Modified Paths:
--------------
branches/soc-2008-mxcurioni/CMakeLists.txt
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/Functors.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/PartialRedux.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/CommaInitializer.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Cwise.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Flagged.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Functors.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Matrix.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/NestByValue.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Part.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Swap.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/util/Memory.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/SVD/SVD.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Sparse/SparseVector.h
branches/soc-2008-mxcurioni/extern/Eigen2/eigen-update.sh
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_Window.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/frameacc.hpp
branches/soc-2008-mxcurioni/intern/itasc/kdl/framevel.hpp
branches/soc-2008-mxcurioni/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ops.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_armature.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_empty.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_mesh.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_material.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_particle.py
branches/soc-2008-mxcurioni/release/scripts/ui/buttons_texture.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_outliner.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_sequencer.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_userpref.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d.py
branches/soc-2008-mxcurioni/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_animsys.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_blender.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_curve.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_global.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_key.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_material.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_mesh.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_modifier.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_sequence.h
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/armature.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/blender.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/curve.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/displist.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/key.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/lattice.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/mesh.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/modifier.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/node.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/paint.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle_system.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequence.c
branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_bfile.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_editVert.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_util.h
branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_winstuff.h
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/storage.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/util.c
branches/soc-2008-mxcurioni/source/blender/blenlib/intern/winstuff.c
branches/soc-2008-mxcurioni/source/blender/blenloader/BLO_readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readblenentry.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.h
branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_markers.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframes_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/editarmature.c
branches/soc-2008-mxcurioni/source/blender/editors/armature/poseobject.c
branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_mesh.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_physics.h
branches/soc-2008-mxcurioni/source/blender/editors/include/ED_space_api.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
branches/soc-2008-mxcurioni/source/blender/editors/include/UI_interface.h
branches/soc-2008-mxcurioni/source/blender/editors/interface/Makefile
branches/soc-2008-mxcurioni/source/blender/editors/interface/SConscript
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_icons.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_panel.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_regions.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_style.c
branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editface.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/loopcut.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/mesh/mesh_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/mesh/meshtools.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/object/object_modifier.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_shapekey.c
branches/soc-2008-mxcurioni/source/blender/editors/object/object_vgroup.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/particle_object.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_fluid.c
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/physics/physics_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2008-mxcurioni/source/blender/editors/sound/sound_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_action/action_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_api/spacetypes.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2008-mxcurioni/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_console/console_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_graph/space_graph.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/image_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_image/space_image.c
branches/soc-2008-mxcurioni/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_nla/space_nla.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/node_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner.c
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_script/script_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/space_sequencer.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/space_text/text_python.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawobject.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform.h
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_conversions.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_generics.c
branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_snap.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_material.c
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl
branches/soc-2008-mxcurioni/source/blender/gpu/intern/gpu_shader_material.glsl.c
branches/soc-2008-mxcurioni/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_object_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_screen_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_space_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_text_types.h
branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_types.h
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_key.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_sequence.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_wm.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_defocus.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/CMP_util.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/SHD_nodes/SHD_mixRgb.c
branches/soc-2008-mxcurioni/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/soc-2008-mxcurioni/source/blender/python/generic/matrix.c
branches/soc-2008-mxcurioni/source/blender/python/generic/vector.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
branches/soc-2008-mxcurioni/source/blender/render/SConscript
branches/soc-2008-mxcurioni/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2008-mxcurioni/source/blender/render/intern/source/pipeline.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/rayshade.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volume_precache.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/volumetric.c
branches/soc-2008-mxcurioni/source/blender/render/intern/source/zbuf.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_api.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_files.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_window.c
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_event_types.h
branches/soc-2008-mxcurioni/source/blender/windowmanager/wm_window.h
branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
branches/soc-2008-mxcurioni/source/creator/SConscript
branches/soc-2008-mxcurioni/source/creator/buildinfo.c
branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2008-mxcurioni/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2008-mxcurioni/source/nan_compile.mk
branches/soc-2008-mxcurioni/tools/Blender.py
Added Paths:
-----------
branches/soc-2008-mxcurioni/release/environment-macosx
branches/soc-2008-mxcurioni/release/environment-mswindows
branches/soc-2008-mxcurioni/release/environment-unix
Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt 2009-10-25 10:43:03 UTC (rev 24078)
@@ -82,7 +82,8 @@
OPTION(WITH_INSTALL "Install accompanying scripts and language files needed to run blender" ON)
IF (APPLE)
-OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" OFF)
+OPTION(WITH_COCOA "Use Cocoa framework instead of deprecated Carbon" ON)
+OPTION(WITH_LIBS10.5 "Use 10.5 libs (needed for 64bit builds)" OFF)
ENDIF (APPLE)
IF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
@@ -396,17 +397,22 @@
ENDIF(WIN32)
IF(APPLE)
- IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
- ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
- SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
- ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ IF(WITH_LIBS10.5)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-9.x.universal)
+ ELSE(WITH_LIBS10.5)
+ IF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-8.x.i386)
+ ELSE(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ SET(LIBDIR ${CMAKE_SOURCE_DIR}/../lib/darwin-6.1-powerpc)
+ ENDIF(CMAKE_OSX_ARCHITECTURES MATCHES i386)
+ ENDIF(WITH_LIBS10.5)
+
IF(WITH_OPENAL)
FIND_PACKAGE(OpenAL)
IF(OPENAL_FOUND)
SET(WITH_OPENAL ON)
- SET(OPENAL_INCLUDE_DIR "${OPENAL_INCLUDE_DIR};${LIBDIR}/openal/include")
+ SET(OPENAL_INCLUDE_DIR "${LIBDIR}/openal/include")
ELSE(OPENAL_FOUND)
SET(WITH_OPENAL OFF)
ENDIF(OPENAL_FOUND)
@@ -432,20 +438,20 @@
# we use precompiled libraries for py 3.1 and up by default
SET(PYTHON ${LIBDIR}/python)
- SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}" CACHE STRING "")
- # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}" CACHE STRING "") # not used yet
+ SET(PYTHON_INC "${PYTHON}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY "${PYTHON}/bin/python${PYTHON_VERSION}") # not used yet
SET(PYTHON_LIB python${PYTHON_VERSION})
- SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}" CACHE STRING "")
+ SET(PYTHON_LIBPATH "${PYTHON}/lib/python${PYTHON_VERSION}")
# SET(PYTHON_LINKFLAGS "-u _PyMac_Error") # won't build with this enabled
ELSE(PYTHON_VERSION MATCHES 3.1)
# otherwise, use custom system framework
SET(PYTHON /System/Library/Frameworks/Python.framework/Versions/)
SET(PYTHON_VERSION 2.5)
- SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}" CACHE STRING "")
- # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION} CACHE STRING "") # not used yet
+ SET(PYTHON_INC "${PYTHON}${PYTHON_VERSION}/include/python${PYTHON_VERSION}")
+ # SET(PYTHON_BINARY ${PYTHON}${PYTHON_VERSION}/bin/python${PYTHON_VERSION}) # not used yet
SET(PYTHON_LIB "")
- SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config CACHE STRING "")
+ SET(PYTHON_LIBPATH ${PYTHON}${PYTHON_VERSION}/lib/python${PYTHON_VERSION}/config)
SET(PYTHON_LINKFLAGS "-u _PyMac_Error -framework System -framework Python")
ENDIF(PYTHON_VERSION MATCHES 3.1)
@@ -457,7 +463,7 @@
IF(WITH_FFTW3)
SET(FFTW3 ${LIBDIR}/fftw3)
SET(FFTW3_INC ${FFTW3}/include)
- SET(FFTW3_LIB libfftw)
+ SET(FFTW3_LIB fftw3)
SET(FFTW3_LIBPATH ${FFTW3}/lib)
ENDIF(WITH_FFTW3)
@@ -529,15 +535,21 @@
# buildinfo
-IF(UNIX)
- IF(WITH_BUILDINFO)
+IF(WITH_BUILDINFO)
+ # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
+ IF(UNIX)
EXEC_PROGRAM("date \"+%Y-%m-%d\"" OUTPUT_VARIABLE BUILD_DATE)
EXEC_PROGRAM("date \"+%H:%M:%S\"" OUTPUT_VARIABLE BUILD_TIME)
EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
- # BUILD_PLATFORM and BUILD_PLATFORM are taken from CMake
- ENDIF(WITH_BUILDINFO)
-ENDIF(UNIX)
-
+ ENDIF(UNIX)
+
+ IF(WIN32)
+ EXEC_PROGRAM("cmd /c date /t" OUTPUT_VARIABLE BUILD_DATE)
+ EXEC_PROGRAM("cmd /c time /t" OUTPUT_VARIABLE BUILD_TIME)
+ EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV)
+ ENDIF(WIN32)
+ENDIF(WITH_BUILDINFO)
+
#-----------------------------------------------------------------------------
# Common.
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/Functors.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/Functors.h 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/Functors.h 2009-10-25 10:43:03 UTC (rev 24078)
@@ -43,6 +43,8 @@
inline const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_padd(a, ei_pset1(m_other)); }
const Scalar m_other;
+private:
+ ei_scalar_add_op& operator=(const ei_scalar_add_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_add_op<Scalar> >
@@ -138,6 +140,8 @@
inline ei_scalar_pow_op(const Scalar& exponent) : m_exponent(exponent) {}
inline Scalar operator() (const Scalar& a) const { return ei_pow(a, m_exponent); }
const Scalar m_exponent;
+private:
+ ei_scalar_pow_op& operator=(const ei_scalar_pow_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_pow_op<Scalar> >
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/PartialRedux.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/PartialRedux.h 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Array/PartialRedux.h 2009-10-25 10:43:03 UTC (rev 24078)
@@ -133,6 +133,8 @@
inline result_type operator()(const MatrixBase<Derived>& mat) const
{ return mat.redux(m_functor); }
const BinaryOp m_functor;
+private:
+ ei_member_redux& operator=(const ei_member_redux&);
};
/** \array_module \ingroup Array
@@ -290,6 +292,9 @@
protected:
ExpressionTypeNested m_matrix;
+
+ private:
+ PartialRedux& operator=(const PartialRedux&);
};
/** \array_module
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/CommaInitializer.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/CommaInitializer.h 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/CommaInitializer.h 2009-10-25 10:43:03 UTC (rev 24078)
@@ -116,6 +116,9 @@
int m_row; // current row id
int m_col; // current col id
int m_currentBlockRows; // current block height
+
+private:
+ CommaInitializer& operator=(const CommaInitializer&);
};
/** \anchor MatrixBaseCommaInitRef
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Cwise.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Cwise.h 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Cwise.h 2009-10-25 10:43:03 UTC (rev 24078)
@@ -178,6 +178,9 @@
protected:
ExpressionTypeNested m_matrix;
+
+ private:
+ Cwise& operator=(const Cwise&);
};
/** \returns a Cwise wrapper of *this providing additional coefficient-wise operations
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Flagged.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Flagged.h 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Flagged.h 2009-10-25 10:43:03 UTC (rev 24078)
@@ -109,6 +109,9 @@
protected:
ExpressionTypeNested m_matrix;
+
+private:
+ Flagged& operator=(const Flagged&);
};
/** \returns an expression of *this with added flags
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Functors.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Functors.h 2009-10-25 07:51:40 UTC (rev 24077)
+++ branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Functors.h 2009-10-25 10:43:03 UTC (rev 24078)
@@ -279,6 +279,8 @@
EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_pmul(a, ei_pset1(m_other)); }
const Scalar m_other;
+private:
+ ei_scalar_multiple_op& operator=(const ei_scalar_multiple_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_multiple_op<Scalar> >
@@ -294,6 +296,8 @@
EIGEN_STRONG_INLINE const PacketScalar packetOp(const PacketScalar& a) const
{ return ei_pmul(a, ei_pset1(m_other)); }
const Scalar m_other;
+private:
+ ei_scalar_quotient1_impl& operator=(const ei_scalar_quotient1_impl&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_quotient1_impl<Scalar,true> >
@@ -306,6 +310,8 @@
EIGEN_STRONG_INLINE ei_scalar_quotient1_impl(const Scalar& other) : m_other(other) {}
EIGEN_STRONG_INLINE Scalar operator() (const Scalar& a) const { return a / m_other; }
const Scalar m_other;
+private:
+ ei_scalar_quotient1_impl& operator=(const ei_scalar_quotient1_impl&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_quotient1_impl<Scalar,false> >
@@ -323,6 +329,8 @@
struct ei_scalar_quotient1_op : ei_scalar_quotient1_impl<Scalar, NumTraits<Scalar>::HasFloatingPoint > {
EIGEN_STRONG_INLINE ei_scalar_quotient1_op(const Scalar& other)
: ei_scalar_quotient1_impl<Scalar, NumTraits<Scalar>::HasFloatingPoint >(other) {}
+private:
+ ei_scalar_quotient1_op& operator=(const ei_scalar_quotient1_op&);
};
// nullary functors
@@ -335,6 +343,8 @@
EIGEN_STRONG_INLINE const Scalar operator() (int, int = 0) const { return m_other; }
EIGEN_STRONG_INLINE const PacketScalar packetOp() const { return ei_pset1(m_other); }
const Scalar m_other;
+private:
+ ei_scalar_constant_op& operator=(const ei_scalar_constant_op&);
};
template<typename Scalar>
struct ei_functor_traits<ei_scalar_constant_op<Scalar> >
Modified: branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Matrix.h
===================================================================
--- branches/soc-2008-mxcurioni/extern/Eigen2/Eigen/src/Core/Matrix.h 2009-10-25 07:51:40 UTC (rev 24077)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list