[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24248] branches/soc-2009-chingachgook: Merge from trunk -r 23968:24181.
Arystanbek Dyussenov
arystan.d at gmail.com
Mon Nov 2 17:41:58 CET 2009
Revision: 24248
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24248
Author: kazanbas
Date: 2009-11-02 17:41:57 +0100 (Mon, 02 Nov 2009)
Log Message:
-----------
Merge from trunk -r 23968:24181.
Modified Paths:
--------------
branches/soc-2009-chingachgook/CMakeLists.txt
branches/soc-2009-chingachgook/SConstruct
branches/soc-2009-chingachgook/config/darwin-config.py
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Array/Functors.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Array/PartialRedux.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/CommaInitializer.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/Cwise.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/Flagged.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/Functors.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/Matrix.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/NestByValue.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/Part.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/Swap.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Core/util/Memory.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/SVD/SVD.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/AmbiVector.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseBlock.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseCwise.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseDiagonalProduct.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseFlagged.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseMatrix.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseTranspose.h
branches/soc-2009-chingachgook/extern/Eigen2/Eigen/src/Sparse/SparseVector.h
branches/soc-2009-chingachgook/extern/Eigen2/eigen-update.sh
branches/soc-2009-chingachgook/extern/glew/include/GL/glew.h
branches/soc-2009-chingachgook/intern/ghost/SConscript
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_WindowCocoa.h
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2009-chingachgook/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2009-chingachgook/intern/itasc/kdl/frameacc.hpp
branches/soc-2009-chingachgook/intern/itasc/kdl/framevel.hpp
branches/soc-2009-chingachgook/projectfiles_vc9/blender/editors/ED_editors.vcproj
branches/soc-2009-chingachgook/release/scripts/io/export_3ds.py
branches/soc-2009-chingachgook/release/scripts/io/export_ply.py
branches/soc-2009-chingachgook/release/scripts/io/import_3ds.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy_ops.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_bone.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_curve.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_empty.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_data_mesh.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_material.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_object.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_object_constraint.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_particle.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_cloth.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_common.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_physics_field.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_texture.py
branches/soc-2009-chingachgook/release/scripts/ui/buttons_world.py
branches/soc-2009-chingachgook/release/scripts/ui/space_console.py
branches/soc-2009-chingachgook/release/scripts/ui/space_filebrowser.py
branches/soc-2009-chingachgook/release/scripts/ui/space_info.py
branches/soc-2009-chingachgook/release/scripts/ui/space_outliner.py
branches/soc-2009-chingachgook/release/scripts/ui/space_sequencer.py
branches/soc-2009-chingachgook/release/scripts/ui/space_text.py
branches/soc-2009-chingachgook/release/scripts/ui/space_userpref.py
branches/soc-2009-chingachgook/release/scripts/ui/space_view3d.py
branches/soc-2009-chingachgook/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2009-chingachgook/source/blender/blenfont/intern/blf.c
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_animsys.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_armature.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_blender.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_context.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_curve.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_global.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_key.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_mesh.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_modifier.h
branches/soc-2009-chingachgook/source/blender/blenkernel/BKE_sequence.h
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/anim.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/armature.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/blender.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/constraint.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/context.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/curve.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/displist.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/key.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/lattice.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/mesh.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/modifier.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/paint.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/particle.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/sequence.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/smoke.c
branches/soc-2009-chingachgook/source/blender/blenkernel/intern/softbody.c
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_arithb.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_bfile.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_editVert.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_util.h
branches/soc-2009-chingachgook/source/blender/blenlib/BLI_winstuff.h
branches/soc-2009-chingachgook/source/blender/blenlib/intern/BLI_bfile.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/arithb.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/storage.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/util.c
branches/soc-2009-chingachgook/source/blender/blenlib/intern/winstuff.c
branches/soc-2009-chingachgook/source/blender/blenloader/BLO_readfile.h
branches/soc-2009-chingachgook/source/blender/blenloader/intern/readblenentry.c
branches/soc-2009-chingachgook/source/blender/blenloader/intern/readfile.c
branches/soc-2009-chingachgook/source/blender/blenloader/intern/readfile.h
branches/soc-2009-chingachgook/source/blender/blenloader/intern/writefile.c
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_draw.c
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_filter.c
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_markers.c
branches/soc-2009-chingachgook/source/blender/editors/animation/anim_ops.c
branches/soc-2009-chingachgook/source/blender/editors/animation/keyframes_edit.c
branches/soc-2009-chingachgook/source/blender/editors/animation/keyframing.c
branches/soc-2009-chingachgook/source/blender/editors/animation/keyingsets.c
branches/soc-2009-chingachgook/source/blender/editors/armature/armature_ops.c
branches/soc-2009-chingachgook/source/blender/editors/armature/editarmature.c
branches/soc-2009-chingachgook/source/blender/editors/curve/editcurve.c
branches/soc-2009-chingachgook/source/blender/editors/datafiles/B.blend.c
branches/soc-2009-chingachgook/source/blender/editors/include/ED_armature.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_keyframes_edit.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_mesh.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_object.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_physics.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_space_api.h
branches/soc-2009-chingachgook/source/blender/editors/include/ED_view3d.h
branches/soc-2009-chingachgook/source/blender/editors/include/UI_icons.h
branches/soc-2009-chingachgook/source/blender/editors/include/UI_interface.h
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_anim.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_handlers.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_intern.h
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_layout.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_panel.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_regions.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_templates.c
branches/soc-2009-chingachgook/source/blender/editors/interface/interface_utils.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editface.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_add.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_loop.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/loopcut.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/mesh_intern.h
branches/soc-2009-chingachgook/source/blender/editors/mesh/mesh_ops.c
branches/soc-2009-chingachgook/source/blender/editors/mesh/meshtools.c
branches/soc-2009-chingachgook/source/blender/editors/metaball/mball_edit.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_add.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_edit.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_intern.h
branches/soc-2009-chingachgook/source/blender/editors/object/object_modifier.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_ops.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_relations.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_shapekey.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_transform.c
branches/soc-2009-chingachgook/source/blender/editors/object/object_vgroup.c
branches/soc-2009-chingachgook/source/blender/editors/physics/particle_edit.c
branches/soc-2009-chingachgook/source/blender/editors/physics/particle_object.c
branches/soc-2009-chingachgook/source/blender/editors/physics/physics_fluid.c
branches/soc-2009-chingachgook/source/blender/editors/physics/physics_intern.h
branches/soc-2009-chingachgook/source/blender/editors/physics/physics_ops.c
branches/soc-2009-chingachgook/source/blender/editors/screen/Makefile
branches/soc-2009-chingachgook/source/blender/editors/screen/SConscript
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_context.c
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_edit.c
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_intern.h
branches/soc-2009-chingachgook/source/blender/editors/screen/screen_ops.c
branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2009-chingachgook/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2009-chingachgook/source/blender/editors/sound/sound_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_action/action_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_api/spacetypes.c
branches/soc-2009-chingachgook/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2009-chingachgook/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_console/console_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_file/file_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_graph/graph_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_graph/space_graph.c
branches/soc-2009-chingachgook/source/blender/editors/space_image/image_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_image/image_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_image/space_image.c
branches/soc-2009-chingachgook/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_nla/nla_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_node/drawnode.c
branches/soc-2009-chingachgook/source/blender/editors/space_node/space_node.c
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/outliner.c
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2009-chingachgook/source/blender/editors/space_script/script_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2009-chingachgook/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_text/space_text.c
branches/soc-2009-chingachgook/source/blender/editors/space_text/text_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_text/text_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_text/text_python.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawobject.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_buttons.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_snap.c
branches/soc-2009-chingachgook/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform.h
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_constraints.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_conversions.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_generics.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_manipulator.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_orientations.c
branches/soc-2009-chingachgook/source/blender/editors/transform/transform_snap.c
branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2009-chingachgook/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2009-chingachgook/source/blender/gpu/GPU_extensions.h
branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2009-chingachgook/source/blender/gpu/intern/gpu_material.c
branches/soc-2009-chingachgook/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2009-chingachgook/source/blender/imbuf/CMakeLists.txt
branches/soc-2009-chingachgook/source/blender/imbuf/SConscript
branches/soc-2009-chingachgook/source/blender/imbuf/intern/readimage.c
branches/soc-2009-chingachgook/source/blender/imbuf/intern/writeimage.c
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_armature_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_constraint_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_fileglobal_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_object_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_scene_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_screen_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_space_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_text_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2009-chingachgook/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2009-chingachgook/source/blender/makesrna/RNA_access.h
branches/soc-2009-chingachgook/source/blender/makesrna/intern/makesrna.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_access.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_armature.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_curve.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_internal.h
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_key.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_scene.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_space.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_texture.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_ui.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_wm.c
branches/soc-2009-chingachgook/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2009-chingachgook/source/blender/nodes/intern/CMP_nodes/CMP_image.c
branches/soc-2009-chingachgook/source/blender/nodes/intern/CMP_util.c
branches/soc-2009-chingachgook/source/blender/nodes/intern/TEX_nodes/TEX_output.c
branches/soc-2009-chingachgook/source/blender/python/generic/matrix.c
branches/soc-2009-chingachgook/source/blender/python/generic/vector.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_interface.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_operator.c
branches/soc-2009-chingachgook/source/blender/python/intern/bpy_rna.c
branches/soc-2009-chingachgook/source/blender/render/intern/raytrace/reorganize.h
branches/soc-2009-chingachgook/source/blender/render/intern/source/volume_precache.c
branches/soc-2009-chingachgook/source/blender/render/intern/source/zbuf.c
branches/soc-2009-chingachgook/source/blender/windowmanager/WM_api.h
branches/soc-2009-chingachgook/source/blender/windowmanager/WM_types.h
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_files.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2009-chingachgook/source/blender/windowmanager/intern/wm_window.c
branches/soc-2009-chingachgook/source/blender/windowmanager/wm.h
branches/soc-2009-chingachgook/source/blender/windowmanager/wm_event_types.h
branches/soc-2009-chingachgook/source/blender/windowmanager/wm_window.h
branches/soc-2009-chingachgook/source/creator/CMakeLists.txt
branches/soc-2009-chingachgook/source/creator/SConscript
branches/soc-2009-chingachgook/source/creator/buildinfo.c
branches/soc-2009-chingachgook/source/creator/creator.c
branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2009-chingachgook/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ArmatureActuator.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinDeformer.cpp
branches/soc-2009-chingachgook/source/gameengine/Converter/BL_SkinDeformer.h
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_GameObject.cpp
branches/soc-2009-chingachgook/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2009-chingachgook/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2009-chingachgook/source/nan_compile.mk
branches/soc-2009-chingachgook/tools/Blender.py
branches/soc-2009-chingachgook/tools/btools.py
Added Paths:
-----------
branches/soc-2009-chingachgook/release/environment-macosx
branches/soc-2009-chingachgook/release/environment-mswindows
branches/soc-2009-chingachgook/release/environment-unix
branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/
branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/Object.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/__init__.py
branches/soc-2009-chingachgook/release/scripts/modules/console/
branches/soc-2009-chingachgook/release/scripts/modules/console/__init__.py
branches/soc-2009-chingachgook/release/scripts/modules/console/complete_import.py
branches/soc-2009-chingachgook/release/scripts/modules/console/complete_namespace.py
branches/soc-2009-chingachgook/release/scripts/modules/console/intellisense.py
branches/soc-2009-chingachgook/release/scripts/templates/
branches/soc-2009-chingachgook/release/scripts/templates/gamelogic.py
branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_basic.py
branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_module.py
branches/soc-2009-chingachgook/release/scripts/templates/operator.py
branches/soc-2009-chingachgook/release/scripts/templates/operator_simple.py
branches/soc-2009-chingachgook/source/blender/imbuf/intern/IMB_cocoa.h
branches/soc-2009-chingachgook/source/blender/imbuf/intern/imbuf_cocoa.m
Removed Paths:
-------------
branches/soc-2009-chingachgook/release/scripts/modules/autocomplete.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/Object.py
branches/soc-2009-chingachgook/release/scripts/modules/bpy_ext/__init__.py
branches/soc-2009-chingachgook/release/scripts/modules/console/__init__.py
branches/soc-2009-chingachgook/release/scripts/modules/console/complete_import.py
branches/soc-2009-chingachgook/release/scripts/modules/console/complete_namespace.py
branches/soc-2009-chingachgook/release/scripts/modules/console/intellisense.py
branches/soc-2009-chingachgook/release/scripts/templates/gamelogic.py
branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_basic.py
branches/soc-2009-chingachgook/release/scripts/templates/gamelogic_module.py
branches/soc-2009-chingachgook/release/scripts/templates/operator.py
branches/soc-2009-chingachgook/release/scripts/templates/operator_simple.py
Modified: branches/soc-2009-chingachgook/CMakeLists.txt
===================================================================
--- branches/soc-2009-chingachgook/CMakeLists.txt 2009-11-02 16:39:45 UTC (rev 24247)
+++ branches/soc-2009-chingachgook/CMakeLists.txt 2009-11-02 16:41:57 UTC (rev 24248)
@@ -549,15 +549,27 @@
# 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)
-
+ EXEC_PROGRAM("svnversion ${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE BUILD_REV RETURN_VALUE BUILD_REV_RETURN)
+ IF(BUILD_REV_RETURN)
+ SET(BUILD_REV "unknown")
+ ENDIF(BUILD_REV_RETURN)
+ 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 RETURN_VALUE BUILD_REV_RETURN)
+ IF(BUILD_REV_RETURN)
+ SET(BUILD_REV "unknown")
+ ENDIF(BUILD_REV_RETURN)
+ ENDIF(WIN32)
+ENDIF(WITH_BUILDINFO)
+
#-----------------------------------------------------------------------------
# Common.
Modified: branches/soc-2009-chingachgook/SConstruct
===================================================================
--- branches/soc-2009-chingachgook/SConstruct 2009-11-02 16:39:45 UTC (rev 24247)
+++ branches/soc-2009-chingachgook/SConstruct 2009-11-02 16:41:57 UTC (rev 24248)
@@ -217,6 +217,11 @@
env.Append(CPPFLAGS=['-fopenmp'])
env.Append(CXXFLAGS=['-fopenmp'])
+if env['WITH_GHOST_COCOA'] == True:
+ env.Append(CFLAGS=['-DGHOST_COCOA'])
+ env.Append(CXXFLAGS=['-DGHOST_COCOA'])
+ env.Append(CPPFLAGS=['-DGHOST_COCOA'])
+
#check for additional debug libnames
if env.has_key('BF_DEBUG_LIBS'):
Modified: branches/soc-2009-chingachgook/config/darwin-config.py
===================================================================
--- branches/soc-2009-chingachgook/config/darwin-config.py 2009-11-02 16:39:45 UTC (rev 24247)
+++ branches/soc-2009-chingachgook/config/darwin-config.py 2009-11-02 16:41:57 UTC (rev 24248)
@@ -1,3 +1,10 @@
+#
+# Note : if you want to alter this file
+# copy it as a whole in the upper folder
+# as user-config.py
+# dont create a new file with only some
+# vars changed.
+
import commands
# IMPORTANT NOTE : OFFICIAL BUILDS SHOULD BE DONE WITH SDKs
@@ -3,4 +10,12 @@
USE_SDK=True
+#############################################################################
+################### Cocoa & architecture settings ##################
+#############################################################################
+
+WITH_GHOST_COCOA=True
+MACOSX_ARCHITECTURE = 'i386' # valid archs: ppc, i386, ppc64, x86_64
+
+
cmd = 'uname -p'
MAC_PROC=commands.getoutput(cmd)
@@ -11,28 +26,42 @@
MAC_CUR_VER='10.3'
elif cmd_res[0]=='8':
MAC_CUR_VER='10.4'
-else:
+elif cmd_res[0]=='9':
MAC_CUR_VER='10.5'
+elif cmd_res[0]=='10':
+ MAC_CUR_VER='10.6'
if MAC_PROC == 'powerpc':
LCGDIR = '#../lib/darwin-6.1-powerpc'
else :
- LCGDIR = '#../lib/darwin-8.x.i386'
+ LCGDIR = '#../lib/darwin-9.x.universal'
LIBDIR = '${LCGDIR}'
BF_PYTHON_VERSION = '3.1'
-if MAC_PROC== 'powerpc' and BF_PYTHON_VERSION == '2.3':
+if MAC_PROC == 'powerpc' and BF_PYTHON_VERSION == '2.3':
MAC_MIN_VERS = '10.3'
MACOSX_SDK='/Developer/SDKs/MacOSX10.3.9.sdk'
-else:
+ CC = 'gcc'
+ CXX = 'g++'
+elif MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'ppc':
MAC_MIN_VERS = '10.4'
MACOSX_SDK='/Developer/SDKs/MacOSX10.4u.sdk'
+ CC = 'gcc-4.0'
+ CXX = 'g++-4.0'
+else :
+ MAC_MIN_VERS = '10.5'
+ MACOSX_SDK='/Developer/SDKs/MacOSX10.5.sdk'
+ CC = 'gcc-4.2'
+ CXX = 'g++-4.2'
+#############################################################################
+################### Dependency settings ##################
+#############################################################################
# enable ffmpeg support
WITH_BF_FFMPEG = True # -DWITH_FFMPEG
-FFMPEG_PRECOMPILED = False
+FFMPEG_PRECOMPILED = True
if FFMPEG_PRECOMPILED:
# use precompiled ffmpeg in /lib
BF_FFMPEG = LIBDIR + '/ffmpeg'
@@ -45,8 +74,8 @@
BF_FFMPEG_INC = '${BF_FFMPEG}'
if USE_SDK==True:
BF_FFMPEG_EXTRA = '-isysroot '+MACOSX_SDK+' -mmacosx-version-min='+MAC_MIN_VERS
- BF_XVIDCORE_CONFIG = '--disable-assembly' # currently causes errors, even with yasm installed
- BF_X264_CONFIG = '--disable-pthread'
+ BF_XVIDCORE_CONFIG = '--disable-assembly --disable-mmx' # currently causes errors, even with yasm installed
+ BF_X264_CONFIG = '--disable-pthread --disable-asm'
if BF_PYTHON_VERSION=='3.1':
# python 3.1 uses precompiled libraries in bf svn /lib by default
@@ -75,10 +104,11 @@
BF_PYTHON_LINKFLAGS = ['-u','_PyMac_Error','-framework','System','-framework','Python']
if MAC_CUR_VER=='10.3' or MAC_CUR_VER=='10.4':
BF_PYTHON_LINKFLAGS = ['-u', '__dummy']+BF_PYTHON_LINKFLAGS
+
-BF_QUIET = '1'
-WITH_BF_OPENMP = '0'
+WITH_BF_OPENMP = '0' # multithreading for fluids, cloth and smoke ( only works with ICC atm )
+WITH_BF_OPENAL = True
#different lib must be used following version of gcc
# for gcc 3.3
#BF_OPENAL = LIBDIR + '/openal'
@@ -89,11 +119,11 @@
BF_OPENAL = LIBDIR + '/openal'
WITH_BF_STATICOPENAL = False
-BF_OPENAL_INC = '${BF_OPENAL}/include'
-BF_OPENAL_LIB = 'openal'
-BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
+BF_OPENAL_INC = '${BF_OPENAL}/include' # only headers from libdir needed for proper use of framework !!!!
+#BF_OPENAL_LIB = 'openal'
+#BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
# Warning, this static lib configuration is untested! users of this OS please confirm.
-BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
+#BF_OPENAL_LIB_STATIC = '${BF_OPENAL}/lib/libopenal.a'
# Warning, this static lib configuration is untested! users of this OS please confirm.
BF_CXX = '/usr'
@@ -199,10 +229,13 @@
BF_FREETYPE_LIB = 'freetype'
BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
-WITH_BF_QUICKTIME = True # -DWITH_QUICKTIME
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+ WITH_BF_QUICKTIME = False # -DWITH_QUICKTIME ( disable for 64bit atm )
+else:
+ WITH_BF_QUICKTIME = True
WITH_BF_ICONV = True
-BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV = '/usr'
BF_ICONV_INC = '${BF_ICONV}/include'
BF_ICONV_LIB = 'iconv'
#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
@@ -213,13 +246,31 @@
BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
-CFLAGS = ['-pipe','-fPIC','-funsigned-char']
+#############################################################################
+################### various compile settings and flags ##################
+#############################################################################
-CPPFLAGS = ['-fpascal-strings']
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fpascal-strings']
-CXXFLAGS = [ '-pipe','-fPIC','-funsigned-char', '-fpascal-strings']
-PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','QuickTime']
+BF_QUIET = '1' # suppress verbose output
+if MACOSX_ARCHITECTURE == 'x86_64' or MACOSX_ARCHITECTURE == 'ppc64':
+ ARCH_FLAGS = ['-m64']
+else:
+ ARCH_FLAGS = ['-m32']
+
+CFLAGS = ['-pipe','-funsigned-char']+ARCH_FLAGS
+
+CPPFLAGS = ['-fpascal-strings']+ARCH_FLAGS
+CCFLAGS = ['-pipe','-funsigned-char','-fpascal-strings']+ARCH_FLAGS
+CXXFLAGS = ['-pipe','-funsigned-char', '-fpascal-strings']+ARCH_FLAGS
+
+if WITH_GHOST_COCOA==True:
+ PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Cocoa','-framework','Carbon','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
+else:
+ PLATFORM_LINKFLAGS = ['-fexceptions','-framework','CoreServices','-framework','Foundation','-framework','IOKit','-framework','AppKit','-framework','Carbon','-framework','AGL','-framework','AudioUnit','-framework','AudioToolbox','-framework','CoreAudio','-framework','OpenAL']+ARCH_FLAGS
+
+if WITH_BF_QUICKTIME == True:
+ PLATFORM_LINKFLAGS = PLATFORM_LINKFLAGS+['-framework','QuickTime']
+
#note to build succesfully on 10.3.9 SDK you need to patch 10.3.9 by adding the SystemStubs.a lib from 10.4
LLIBS = ['stdc++', 'SystemStubs']
@@ -232,33 +283,34 @@
if USE_SDK==True:
SDK_FLAGS=['-isysroot', MACOSX_SDK,'-mmacosx-version-min='+MAC_MIN_VERS]
- PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS, '-Wl,-syslibroot,' + MACOSX_SDK]+PLATFORM_LINKFLAGS
+ PLATFORM_LINKFLAGS = ['-mmacosx-version-min='+MAC_MIN_VERS,'-Wl','-syslibroot '+MACOSX_SDK]+PLATFORM_LINKFLAGS
CCFLAGS=SDK_FLAGS+CCFLAGS
CXXFLAGS=SDK_FLAGS+CXXFLAGS
-# you can add -mssse3 if gcc >= 4.2
-if MAC_PROC == 'i386':
+if MACOSX_ARCHITECTURE == 'i386' or MACOSX_ARCHITECTURE == 'x86_64':
REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3']
else:
CFLAGS = CFLAGS+['-fno-strict-aliasing']
CCFLAGS = CCFLAGS+['-fno-strict-aliasing']
CXXFLAGS = CXXFLAGS+['-fno-strict-aliasing']
-
REL_CFLAGS = ['-O2']
REL_CCFLAGS = ['-O2']
+# add -mssse3 for intel 64bit archs
+if MACOSX_ARCHITECTURE == 'x86_64':
+ REL_CFLAGS = REL_CFLAGS+['-mssse3']
+ REL_CCFLAGS = REL_CCFLAGS+['-mssse3']
+
##BF_DEPEND = True
##
##AR = ar
##ARFLAGS = ruv
##ARFLAGSQUIET = ru
##
-CC = 'gcc'
-CXX = 'g++'
-C_WARN = ['-Wdeclaration-after-statement']
+#C_WARN = ['-Wdeclaration-after-statement']
-CC_WARN = ['-Wall', '-Wno-long-double']
+CC_WARN = ['-Wall']
##FIX_STUBS_WARNINGS = -Wno-unused
@@ -272,5 +324,9 @@
BF_DEBUG = False
BF_DEBUG_CCFLAGS = ['-g']
+#############################################################################
+################### Output directories ##################
+#############################################################################
+
BF_BUILDDIR='../build/darwin'
BF_INSTALLDIR='../install/darwin'
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list