[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24272] branches/soc-2008-mxcurioni: merged changes to revision 24271

Maxime Curioni maxime.curioni at gmail.com
Tue Nov 3 10:15:21 CET 2009


Revision: 24272
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24272
Author:   mxcurioni
Date:     2009-11-03 10:15:21 +0100 (Tue, 03 Nov 2009)

Log Message:
-----------
merged changes to revision 24271

Revision Links:
--------------
    http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24271

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/CMake/macros.cmake
    branches/soc-2008-mxcurioni/CMakeLists.txt
    branches/soc-2008-mxcurioni/SConstruct
    branches/soc-2008-mxcurioni/config/darwin-config.py
    branches/soc-2008-mxcurioni/config/linux2-config.py
    branches/soc-2008-mxcurioni/config/win32-mingw-config.py
    branches/soc-2008-mxcurioni/config/win32-vc-config.py
    branches/soc-2008-mxcurioni/config/win64-vc-config.py
    branches/soc-2008-mxcurioni/extern/glew/include/GL/glew.h
    branches/soc-2008-mxcurioni/intern/ghost/SConscript
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_SystemWin32.h
    branches/soc-2008-mxcurioni/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2008-mxcurioni/intern/moto/include/MT_assert.h
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.sln
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/blender.vcproj
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/windowmanager/windowmanager.vcproj
    branches/soc-2008-mxcurioni/release/datafiles/blenderbuttons
    branches/soc-2008-mxcurioni/release/datafiles/datatoc.py
    branches/soc-2008-mxcurioni/release/scripts/io/add_mesh_torus.py
    branches/soc-2008-mxcurioni/release/scripts/io/engine_render_pov.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_fbx.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_mdd.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_obj.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_ply.py
    branches/soc-2008-mxcurioni/release/scripts/io/export_x3d.py
    branches/soc-2008-mxcurioni/release/scripts/io/import_3ds.py
    branches/soc-2008-mxcurioni/release/scripts/io/import_obj.py
    branches/soc-2008-mxcurioni/release/scripts/io/mesh_skin.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/balancing.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/client.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/master.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/master_html.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/model.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/operators.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/slave.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/ui.py
    branches/soc-2008-mxcurioni/release/scripts/io/netrender/utils.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ops.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_sys.py
    branches/soc-2008-mxcurioni/release/scripts/modules/dynamic_menu.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_buttons.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_console.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_filebrowser.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_image.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_info.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_logic.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_node.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_text.py
    branches/soc-2008-mxcurioni/release/scripts/ui/space_time.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/release/test/rna_array.py
    branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/SConscript
    branches/soc-2008-mxcurioni/source/blender/blenfont/intern/blf.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_armature.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_context.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/action.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim.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/constraint.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/context.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/fmodifier.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/ipo.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/multires.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/particle.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/sequence.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/smoke.c
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/softbody.c
    branches/soc-2008-mxcurioni/source/blender/blenlib/BLI_arithb.h
    branches/soc-2008-mxcurioni/source/blender/blenlib/intern/arithb.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
    branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyframing.c
    branches/soc-2008-mxcurioni/source/blender/editors/animation/keyingsets.c
    branches/soc-2008-mxcurioni/source/blender/editors/armature/armature_intern.h
    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/curve/editcurve.c
    branches/soc-2008-mxcurioni/source/blender/editors/curve/editfont.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/B.blend.c
    branches/soc-2008-mxcurioni/source/blender/editors/datafiles/blenderbuttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_armature.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_keyframing.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_object.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/ED_view3d.h
    branches/soc-2008-mxcurioni/source/blender/editors/include/UI_icons.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_anim.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_layout.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_utils.c
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_widgets.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/mesh/editmesh_tools.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/metaball/mball_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_add.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_constraint.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_group.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_relations.c
    branches/soc-2008-mxcurioni/source/blender/editors/object/object_transform.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/screen/Makefile
    branches/soc-2008-mxcurioni/source/blender/editors/screen/SConscript
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_context.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/screen/screen_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/sculpt_paint/paint_vertex.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_buttons/space_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_file/file_draw.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_buttons.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/drawnode.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_node/space_node.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_outliner/space_outliner.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_intern.h
    branches/soc-2008-mxcurioni/source/blender/editors/space_sequencer/sequencer_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_text/space_text.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/space_view3d.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_ops.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2008-mxcurioni/source/blender/editors/space_view3d/view3d_snap.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_constraints.c
    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_manipulator.c
    branches/soc-2008-mxcurioni/source/blender/editors/transform/transform_orientations.c
    branches/soc-2008-mxcurioni/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2008-mxcurioni/source/blender/gpu/GPU_extensions.h
    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/ikplugin/intern/iksolver_plugin.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/imbuf/SConscript
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/dynlibtiff.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/readimage.c
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/writeimage.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_armature_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_constraint_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_userdef_types.h
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_access.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_material.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_render.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_space.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ui.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/makesrna/intern/rna_wm_api.c
    branches/soc-2008-mxcurioni/source/blender/python/epy_doc_gen.py
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_interface.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_operator_wrap.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.c
    branches/soc-2008-mxcurioni/source/blender/python/intern/bpy_rna.h
    branches/soc-2008-mxcurioni/source/blender/python/rna_dump.py
    branches/soc-2008-mxcurioni/source/blender/python/simple_enum_gen.py
    branches/soc-2008-mxcurioni/source/blender/render/intern/source/pointdensity.c
    branches/soc-2008-mxcurioni/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/windowmanager/SConscript
    branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
    branches/soc-2008-mxcurioni/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2008-mxcurioni/source/creator/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
    branches/soc-2008-mxcurioni/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.cpp
    branches/soc-2008-mxcurioni/source/gameengine/GamePlayer/common/windows/GPW_KeyboardDevice.h
    branches/soc-2008-mxcurioni/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_ICanvas.h
    branches/soc-2008-mxcurioni/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2008-mxcurioni/source/tools/MakeCursor.py
    branches/soc-2008-mxcurioni/tools/Blender.py
    branches/soc-2008-mxcurioni/tools/btools.py

Added Paths:
-----------
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/collada/
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/collada/BF_collada.vcproj
    branches/soc-2008-mxcurioni/release/scripts/io/vertexpaint_dirt.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ext/
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ext/Object.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ext/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/
    branches/soc-2008-mxcurioni/release/scripts/modules/console/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_import.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_namespace.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/intellisense.py
    branches/soc-2008-mxcurioni/release/scripts/templates/
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic_basic.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic_module.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_simple.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_empty.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_lattice.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_data_text.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_game.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_material.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_scene.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/properties_world.py
    branches/soc-2008-mxcurioni/source/blender/collada/
    branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/SConscript
    branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/IMB_cocoa.h
    branches/soc-2008-mxcurioni/source/blender/imbuf/intern/imbuf_cocoa.m

Removed Paths:
-------------
    branches/soc-2008-mxcurioni/projectfiles_vc9/blender/collada/BF_collada.vcproj
    branches/soc-2008-mxcurioni/release/scripts/modules/autocomplete.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ext/Object.py
    branches/soc-2008-mxcurioni/release/scripts/modules/bpy_ext/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/__init__.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_import.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/complete_namespace.py
    branches/soc-2008-mxcurioni/release/scripts/modules/console/intellisense.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic_basic.py
    branches/soc-2008-mxcurioni/release/scripts/templates/gamelogic_module.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator.py
    branches/soc-2008-mxcurioni/release/scripts/templates/operator_simple.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_armature.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_bone.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_camera.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_curve.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_empty.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_lamp.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_lattice.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_mesh.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_metaball.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_modifier.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_data_text.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_game.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_material.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_object.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_object_constraint.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_particle.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_cloth.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_common.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_field.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_fluid.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_smoke.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_physics_softbody.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_render.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_scene.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_texture.py
    branches/soc-2008-mxcurioni/release/scripts/ui/buttons_world.py
    branches/soc-2008-mxcurioni/source/blender/collada/CMakeLists.txt
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentExporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/DocumentImporter.h
    branches/soc-2008-mxcurioni/source/blender/collada/SConscript
    branches/soc-2008-mxcurioni/source/blender/collada/collada.cpp
    branches/soc-2008-mxcurioni/source/blender/collada/collada.h
    branches/soc-2008-mxcurioni/source/blender/collada/collada_internal.h

Property Changed:
----------------
    branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_handlers.c

Modified: branches/soc-2008-mxcurioni/CMake/macros.cmake
===================================================================
--- branches/soc-2008-mxcurioni/CMake/macros.cmake	2009-11-03 07:24:22 UTC (rev 24271)
+++ branches/soc-2008-mxcurioni/CMake/macros.cmake	2009-11-03 09:15:21 UTC (rev 24272)
@@ -76,6 +76,11 @@
   IF(WITH_FFTW3)
     LINK_DIRECTORIES(${FFTW3_LIBPATH})
   ENDIF(WITH_FFTW3)
+  IF(WITH_OPENCOLLADA)
+    LINK_DIRECTORIES(${OPENCOLLADA_LIBPATH})
+    LINK_DIRECTORIES(${PCRE_LIBPATH})
+    LINK_DIRECTORIES(${EXPAT_LIBPATH})
+  ENDIF(WITH_OPENCOLLADA)
 
   IF(WIN32)
     LINK_DIRECTORIES(${PTHREADS_LIBPATH})
@@ -135,6 +140,11 @@
   IF(WITH_FFMPEG)
     TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB})
   ENDIF(WITH_FFMPEG)
+  IF(WITH_OPENCOLLADA)
+    TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB})
+    TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB})
+  ENDIF(WITH_OPENCOLLADA)
   IF(WIN32)
     TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB})
   ENDIF(WIN32)

Modified: branches/soc-2008-mxcurioni/CMakeLists.txt
===================================================================
--- branches/soc-2008-mxcurioni/CMakeLists.txt	2009-11-03 07:24:22 UTC (rev 24271)
+++ branches/soc-2008-mxcurioni/CMakeLists.txt	2009-11-03 09:15:21 UTC (rev 24272)
@@ -80,6 +80,7 @@
 OPTION(WITH_CXX_GUARDEDALLOC "Enable GuardedAlloc for C++ memory allocation" OFF)
 OPTION(WITH_BUILDINFO     "Include extra build details" ON)
 OPTION(WITH_INSTALL       "Install accompanying scripts and language files needed to run blender" ON)
+OPTION(WITH_OPENCOLLADA		"Enable OpenCollada Support (http://www.opencollada.org/)"	OFF)
 
 IF (APPLE)
 OPTION(WITH_COCOA	  "Use Cocoa framework instead of deprecated Carbon" ON)
@@ -90,6 +91,18 @@
 	MESSAGE("WARNING: WITH_PLAYER needs WITH_GAMEENGINE")
 ENDIF(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 
+IF (WITH_OPENCOLLADA AND NOT APPLE)
+SET(OPENCOLLADA /usr/local/opencollada CACHE FILEPATH "OpenCollada Directory")
+SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA})
+SET(OPENCOLLADA_LIB OpenCollada)
+SET(PCRE /usr CACHE FILEPATH "PCRE Directory")
+SET(PCRE_LIBPATH ${PCRE}/lib)
+SET(PCRE_LIB pcre)
+SET(EXPAT /usr CACHE FILEPATH "Expat Directory")
+SET(EXPAT_LIBPATH ${EXPAT}/lib)
+SET(EXPAT_LIB expat)
+ENDIF (WITH_OPENCOLLADA AND NOT APPLE)
+
 # For alternate Python locations the commandline can be used to override detected/default cache settings, e.g:
 # On Unix: 
 #   cmake -D PYTHON_LIB=/usr/local/lib/python2.3/config/libpython2.3.so -D PYTHON_INC=/usr/local/include/python2.3 -D PYTHON_BINARY=/usr/local/bin/python2.3 -G "Unix Makefiles" ../blender
@@ -503,12 +516,28 @@
 	SET(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
 	SET(PLATFORM_LINKFLAGS "-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime")
 	ENDIF (WITH_COCOA)
+
 	IF(WITH_OPENMP)
-		SET(LLIBS "${LLIBS} -lgomp ")
-		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp ")
-		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp ")
+		SET(LLIBS "${LLIBS} -lgomp")
+		SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fopenmp")
+		SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp")
 	ENDIF(WITH_OPENMP)
 
+	IF (WITH_OPENCOLLADA)
+		SET(OPENCOLLADA ${LIBDIR}/opencollada)
+		SET(OPENCOLLADA_INC ${OPENCOLLADA}/include)
+		SET(OPENCOLLADA_LIBPATH ${OPENCOLLADA}/lib)
+		SET(OPENCOLLADA_LIB "OpenCOLLADASaxFrameworkLoader -lOpenCOLLADAFramework -lOpenCOLLADABaseUtils -lOpenCOLLADAStreamWriter -lMathMLSolver -lGeneratedSaxParser -lUTF -lxml2" )
+		#pcre is bundled with openCollada
+		#SET(PCRE ${LIBDIR}/pcre)
+		#SET(PCRE_LIBPATH ${PCRE}/lib)
+		SET(PCRE_LIB pcre)
+		#native OSX libxml2 is used
+		#SET(EXPAT ${LIBDIR}/expat)
+		#SET(EXPAT_LIBPATH ${EXPAT}/lib)
+		#SET(EXPAT_LIB expat)
+	ENDIF (WITH_OPENCOLLADA)
+
 	SET(SDL ${LIBDIR}/sdl)
 	SET(SDL_INCLUDE_DIR ${SDL}/include)
 	SET(SDL_LIBRARY SDL)
@@ -540,13 +569,19 @@
 	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)
+		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)
+		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)
 	

Modified: branches/soc-2008-mxcurioni/SConstruct
===================================================================
--- branches/soc-2008-mxcurioni/SConstruct	2009-11-03 07:24:22 UTC (rev 24271)
+++ branches/soc-2008-mxcurioni/SConstruct	2009-11-03 09:15:21 UTC (rev 24272)
@@ -124,7 +124,10 @@
 		#if env:
 		#	btools.SetupSpawn(env)
 else:
-	env = BlenderEnvironment(ENV = os.environ)
+	if bitness==64 and platform=='win32':
+		env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
+	else:
+		env = BlenderEnvironment(ENV = os.environ)
 
 if not env:
 	print "Could not create a build environment"
@@ -217,6 +220,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-2008-mxcurioni/config/darwin-config.py
===================================================================
--- branches/soc-2008-mxcurioni/config/darwin-config.py	2009-11-03 07:24:22 UTC (rev 24271)
+++ branches/soc-2008-mxcurioni/config/darwin-config.py	2009-11-03 09:15:21 UTC (rev 24272)
@@ -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,34 @@
 BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list