[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31668] branches/soc-2010-nicolasbishop: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31488 :31667
Nicholas Bishop
nicholasbishop at gmail.com
Mon Aug 30 21:06:15 CEST 2010
Revision: 31668
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31668
Author: nicholasbishop
Date: 2010-08-30 21:06:15 +0200 (Mon, 30 Aug 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r31488:31667
Modified Paths:
--------------
branches/soc-2010-nicolasbishop/CMakeLists.txt
branches/soc-2010-nicolasbishop/SConstruct
branches/soc-2010-nicolasbishop/build_files/scons/config/freebsd7-config.py
branches/soc-2010-nicolasbishop/build_files/scons/config/freebsd8-config.py
branches/soc-2010-nicolasbishop/build_files/scons/config/freebsd9-config.py
branches/soc-2010-nicolasbishop/build_files/scons/config/linux2-config.py
branches/soc-2010-nicolasbishop/build_files/scons/tools/Blender.py
branches/soc-2010-nicolasbishop/build_files/scons/tools/btools.py
branches/soc-2010-nicolasbishop/extern/SConscript
branches/soc-2010-nicolasbishop/extern/libopenjpeg/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/libopenjpeg/SConscript
branches/soc-2010-nicolasbishop/extern/lzma/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/lzma/SConscript
branches/soc-2010-nicolasbishop/extern/lzo/CMakeLists.txt
branches/soc-2010-nicolasbishop/extern/lzo/SConscript
branches/soc-2010-nicolasbishop/intern/audaspace/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/audaspace/SConscript
branches/soc-2010-nicolasbishop/intern/boolop/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/boolop/SConscript
branches/soc-2010-nicolasbishop/intern/bsp/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/bsp/SConscript
branches/soc-2010-nicolasbishop/intern/container/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/container/SConscript
branches/soc-2010-nicolasbishop/intern/decimation/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/decimation/SConscript
branches/soc-2010-nicolasbishop/intern/elbeem/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/elbeem/SConscript
branches/soc-2010-nicolasbishop/intern/ghost/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/ghost/SConscript
branches/soc-2010-nicolasbishop/intern/guardedalloc/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/guardedalloc/SConscript
branches/soc-2010-nicolasbishop/intern/iksolver/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/iksolver/SConscript
branches/soc-2010-nicolasbishop/intern/itasc/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/itasc/SConscript
branches/soc-2010-nicolasbishop/intern/memutil/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/memutil/SConscript
branches/soc-2010-nicolasbishop/intern/moto/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/moto/SConscript
branches/soc-2010-nicolasbishop/intern/opennl/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/opennl/SConscript
branches/soc-2010-nicolasbishop/intern/smoke/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/smoke/SConscript
branches/soc-2010-nicolasbishop/intern/string/CMakeLists.txt
branches/soc-2010-nicolasbishop/intern/string/SConscript
branches/soc-2010-nicolasbishop/release/scripts/io/export_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_fbx.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_ply.py
branches/soc-2010-nicolasbishop/release/scripts/io/export_x3d.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_3ds.py
branches/soc-2010-nicolasbishop/release/scripts/io/import_scene_obj.py
branches/soc-2010-nicolasbishop/release/scripts/io/netrender/slave.py
branches/soc-2010-nicolasbishop/release/scripts/keyingsets/keyingsets_utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/bpy_types.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/neck_flex.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/palm_curl.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/spine_pivot_flex.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify/tongue.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rigify_utils.py
branches/soc-2010-nicolasbishop/release/scripts/modules/rna_prop_ui.py
branches/soc-2010-nicolasbishop/release/scripts/op/add_mesh_torus.py
branches/soc-2010-nicolasbishop/release/scripts/op/animsys_update.py
branches/soc-2010-nicolasbishop/release/scripts/op/object.py
branches/soc-2010-nicolasbishop/release/scripts/op/presets.py
branches/soc-2010-nicolasbishop/release/scripts/op/uv.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_follow_active.py
branches/soc-2010-nicolasbishop/release/scripts/op/uvcalc_smart_project.py
branches/soc-2010-nicolasbishop/release/scripts/presets/interaction/blender.py
branches/soc-2010-nicolasbishop/release/scripts/presets/interaction/maya.py
branches/soc-2010-nicolasbishop/release/scripts/templates/operator_uv.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_animviz.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_armature_rigify.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_bone.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_camera.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_curve.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lamp.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_lattice.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_mesh.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_metaball.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_data_modifier.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_game.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_material.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_object_constraint.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_particle.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_cloth.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_common.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_field.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_fluid.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_smoke.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_physics_softbody.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_render.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_scene.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_texture.py
branches/soc-2010-nicolasbishop/release/scripts/ui/properties_world.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_dopesheet.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_filebrowser.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_graph.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_image.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_info.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_logic.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_nla.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_outliner.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_sequencer.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_time.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_userpref_keymap.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d.py
branches/soc-2010-nicolasbishop/release/scripts/ui/space_view3d_toolbar.py
branches/soc-2010-nicolasbishop/source/SConscript
branches/soc-2010-nicolasbishop/source/blender/blenfont/SConscript
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_constraint.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_customdata.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_deform.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_fcurve.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_mball.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2010-nicolasbishop/source/blender/blenkernel/SConscript
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/action.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/blender.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/constraint.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/context.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/customdata.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/deform.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/image.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/key.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/library.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/mball.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/node.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/packedFile.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/property.c
branches/soc-2010-nicolasbishop/source/blender/blenkernel/intern/sequencer.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_color.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_math_vector.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_rect.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/BLI_string.h
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_color.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/math_vector.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/rct.c
branches/soc-2010-nicolasbishop/source/blender/blenlib/intern/string.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/BLO_readfile.h
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readblenentry.c
branches/soc-2010-nicolasbishop/source/blender/blenloader/intern/readfile.c
branches/soc-2010-nicolasbishop/source/blender/blenpluginapi/SConscript
branches/soc-2010-nicolasbishop/source/blender/collada/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/collada/DocumentExporter.cpp
branches/soc-2010-nicolasbishop/source/blender/collada/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2010-nicolasbishop/source/blender/editors/animation/keyingsets.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/editarmature.c
branches/soc-2010-nicolasbishop/source/blender/editors/armature/poselib.c
branches/soc-2010-nicolasbishop/source/blender/editors/curve/editcurve.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2010-nicolasbishop/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_gpencil.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_mesh.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/ED_view3d.h
branches/soc-2010-nicolasbishop/source/blender/editors/include/UI_interface.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_handlers.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_icons.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_templates.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/interface_widgets.c
branches/soc-2010-nicolasbishop/source/blender/editors/interface/resources.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_lib.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/mesh_data.c
branches/soc-2010-nicolasbishop/source/blender/editors/mesh/meshtools.c
branches/soc-2010-nicolasbishop/source/blender/editors/metaball/mball_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_add.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_relations.c
branches/soc-2010-nicolasbishop/source/blender/editors/object/object_vgroup.c
branches/soc-2010-nicolasbishop/source/blender/editors/render/render_opengl.c
branches/soc-2010-nicolasbishop/source/blender/editors/screen/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_console/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_file/file_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/image_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_image/space_image.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_logic/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_node/drawnode.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_outliner/outliner.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_script/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_text/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_time/space_time.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/SConscript
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawobject.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2010-nicolasbishop/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_conversions.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_manipulator.c
branches/soc-2010-nicolasbishop/source/blender/editors/transform/transform_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/util/undo.c
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2010-nicolasbishop/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2010-nicolasbishop/source/blender/gpu/intern/gpu_draw.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/SConscript
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/dds/SConscript
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/openexr/SConscript
branches/soc-2010-nicolasbishop/source/blender/imbuf/intern/util.c
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_node_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_object_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2010-nicolasbishop/source/blender/makesdna/intern/SConscript
branches/soc-2010-nicolasbishop/source/blender/makesrna/RNA_define.h
branches/soc-2010-nicolasbishop/source/blender/makesrna/SConscript
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/SConscript
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_access.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_action.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_action_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_animation.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_armature.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_color.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_curve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_define.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_fcurve.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_image.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_main_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_material.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_meta.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_nla.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_particle.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_pose.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_property.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_render.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_scene_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sculpt_paint.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_space.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_texture.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/intern/rna_world.c
branches/soc-2010-nicolasbishop/source/blender/makesrna/rna_cleanup/rna_properties.txt
branches/soc-2010-nicolasbishop/source/blender/modifiers/SConscript
branches/soc-2010-nicolasbishop/source/blender/nodes/SConscript
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_crop.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_displace.c
branches/soc-2010-nicolasbishop/source/blender/nodes/intern/CMP_nodes/CMP_rotate.c
branches/soc-2010-nicolasbishop/source/blender/python/SConscript
branches/soc-2010-nicolasbishop/source/blender/python/generic/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/python/generic/bpy_internal_import.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_euler.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_matrix.c
branches/soc-2010-nicolasbishop/source/blender/python/generic/mathutils_vector.c
branches/soc-2010-nicolasbishop/source/blender/python/intern/bpy_rna.c
branches/soc-2010-nicolasbishop/source/blender/quicktime/SConscript
branches/soc-2010-nicolasbishop/source/blender/render/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blender/render/intern/source/pipeline.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/SConscript
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_api.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/WM_types.h
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_files.c
branches/soc-2010-nicolasbishop/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2010-nicolasbishop/source/blenderplayer/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/SConscript
branches/soc-2010-nicolasbishop/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2010-nicolasbishop/source/creator/CMakeLists.txt
branches/soc-2010-nicolasbishop/source/creator/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2010-nicolasbishop/source/gameengine/BlenderRoutines/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/soc-2010-nicolasbishop/source/gameengine/Converter/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/Expressions/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_PythonKeyboard.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_PythonKeyboard.h
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_PythonMouse.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SCA_PythonMouse.h
branches/soc-2010-nicolasbishop/source/gameengine/GameLogic/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/common/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2010-nicolasbishop/source/gameengine/GamePlayer/ghost/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KXNetwork/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_ConvertPhysicsObject.h
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_ConvertPhysicsObjects.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Ketsji/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
branches/soc-2010-nicolasbishop/source/gameengine/Physics/Bullet/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/Physics/common/PHY_DynamicTypes.h
branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/bge.logic.rst
branches/soc-2010-nicolasbishop/source/gameengine/PyDoc/bge.types.rst
branches/soc-2010-nicolasbishop/source/gameengine/Rasterizer/SConscript
branches/soc-2010-nicolasbishop/source/gameengine/VideoTexture/SConscript
branches/soc-2010-nicolasbishop/source/icons/SConscript
Added Paths:
-----------
branches/soc-2010-nicolasbishop/build_files/cmake/example_scripts/make_quicky.py
Modified: branches/soc-2010-nicolasbishop/CMakeLists.txt
===================================================================
--- branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-08-30 14:48:12 UTC (rev 31667)
+++ branches/soc-2010-nicolasbishop/CMakeLists.txt 2010-08-30 19:06:15 UTC (rev 31668)
@@ -294,9 +294,9 @@
SET(EXPAT_LIB expat)
ENDIF (WITH_OPENCOLLADA)
+ FIND_PACKAGE(X11 REQUIRED)
- # Could use ${X11_Xinput_LIB} ${X11_X11_LIB} too
- SET(LLIBS "-lXi -lutil -lc -lm -lpthread -lstdc++ -lX11")
+ SET(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB} ${X11_Xinput_LIB}")
IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
# BSD's dont use libdl.so
@@ -873,7 +873,7 @@
IF(WITH_IMAGE_OPENJPEG)
set(OPENJPEG ${CMAKE_SOURCE_DIR}/extern/libopenjpeg)
set(OPENJPEG_INC ${OPENJPEG})
- set(OPENJPEG_LIb extern_libopenjpeg)
+ set(OPENJPEG_LIb extern_openjpeg)
ENDIF(WITH_IMAGE_OPENJPEG)
#-----------------------------------------------------------------------------
Modified: branches/soc-2010-nicolasbishop/SConstruct
===================================================================
--- branches/soc-2010-nicolasbishop/SConstruct 2010-08-30 14:48:12 UTC (rev 31667)
+++ branches/soc-2010-nicolasbishop/SConstruct 2010-08-30 19:06:15 UTC (rev 31668)
@@ -33,9 +33,9 @@
# Need a better way to do this. Automagical maybe is not the best thing, maybe it is.
if pltfrm.architecture()[0] == '64bit':
- bitness = 64
+ bitness = 64
else:
- bitness = 32
+ bitness = 32
import sys
import os
@@ -79,15 +79,15 @@
# XX cheating for BF_FANCY, we check for BF_FANCY before args are validated
use_color = ARGUMENTS.get('BF_FANCY', '1')
if platform=='win32':
- use_color = None
+ use_color = None
if not use_color=='1':
- B.bc.disable()
-
+ B.bc.disable()
+
#on defaut white Os X terminal, some colors are totally unlegible
if platform=='darwin':
- B.bc.OKGREEN = '\033[34m'
- B.bc.WARNING = '\033[36m'
+ B.bc.OKGREEN = '\033[34m'
+ B.bc.WARNING = '\033[36m'
# arguments
print B.bc.HEADER+'Command-line arguments'+B.bc.ENDC
@@ -110,100 +110,100 @@
quickdebug = B.arguments.get('BF_QUICKDEBUG', None)
if quickdebug:
- B.quickdebug=string.split(quickdebug, ',')
+ B.quickdebug=string.split(quickdebug, ',')
else:
- B.quickdebug=[]
+ B.quickdebug=[]
if quickie:
- B.quickie=string.split(quickie,',')
+ B.quickie=string.split(quickie,',')
else:
- B.quickie=[]
-
+ B.quickie=[]
+
toolset = B.arguments.get('BF_TOOLSET', None)
if toolset:
- print "Using " + toolset
- if toolset=='mstoolkit':
- env = BlenderEnvironment(ENV = os.environ)
- env.Tool('mstoolkit', [toolpath])
- else:
- env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
- # xxx commented out, as was supressing warnings under mingw..
- #if env:
- # btools.SetupSpawn(env)
+ print "Using " + toolset
+ if toolset=='mstoolkit':
+ env = BlenderEnvironment(ENV = os.environ)
+ env.Tool('mstoolkit', [toolpath])
+ else:
+ env = BlenderEnvironment(tools=[toolset], ENV = os.environ)
+ # xxx commented out, as was supressing warnings under mingw..
+ #if env:
+ # btools.SetupSpawn(env)
else:
- if bitness==64 and platform=='win32':
- env = BlenderEnvironment(ENV = os.environ, MSVS_ARCH='amd64')
- 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"
- Exit()
+ print "Could not create a build environment"
+ Exit()
cc = B.arguments.get('CC', None)
cxx = B.arguments.get('CXX', None)
if cc:
- env['CC'] = cc
+ env['CC'] = cc
if cxx:
- env['CXX'] = cxx
+ env['CXX'] = cxx
if env['CC'] in ['cl', 'cl.exe'] and sys.platform=='win32':
- if bitness == 64:
- platform = 'win64-vc'
- else:
- platform = 'win32-vc'
+ if bitness == 64:
+ platform = 'win64-vc'
+ else:
+ platform = 'win32-vc'
elif env['CC'] in ['gcc'] and sys.platform=='win32':
- platform = 'win32-mingw'
+ platform = 'win32-mingw'
env.SConscriptChdir(0)
crossbuild = B.arguments.get('BF_CROSS', None)
if crossbuild and platform not in ('win32-vc', 'win64-vc'):
- platform = 'linuxcross'
+ platform = 'linuxcross'
env['OURPLATFORM'] = platform
configfile = os.path.join("build_files", "scons", "config", platform + "-config.py")
if os.path.exists(configfile):
- print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
+ print B.bc.OKGREEN + "Using config file: " + B.bc.ENDC + configfile
else:
- print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
+ print B.bc.FAIL + configfile + " doesn't exist" + B.bc.ENDC
if crossbuild and env['PLATFORM'] != 'win32':
- print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
- env.Tool('crossmingw', [toolpath])
- # todo: determine proper libs/includes etc.
- # Needed for gui programs, console programs should do without it
+ print B.bc.HEADER+"Preparing for crossbuild"+B.bc.ENDC
+ env.Tool('crossmingw', [toolpath])
+ # todo: determine proper libs/includes etc.
+ # Needed for gui programs, console programs should do without it
- # Now we don't need this option to have console window
- # env.Append(LINKFLAGS=['-mwindows'])
+ # Now we don't need this option to have console window
+ # env.Append(LINKFLAGS=['-mwindows'])
userconfig = B.arguments.get('BF_CONFIG', 'user-config.py')
# first read platform config. B.arguments will override
optfiles = [configfile]
if os.path.exists(userconfig):
- print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
- optfiles += [userconfig]
+ print B.bc.OKGREEN + "Using user-config file: " + B.bc.ENDC + userconfig
+ optfiles += [userconfig]
else:
- print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
+ print B.bc.WARNING + userconfig + " not found, no user overrides" + B.bc.ENDC
opts = btools.read_opts(env, optfiles, B.arguments)
opts.Update(env)
if not env['BF_FANCY']:
- B.bc.disable()
+ B.bc.disable()
# remove install dir so old and new files are not mixed.
# NOTE: only do the scripts directory for now, otherwise is too disruptive for developers
# TODO: perhaps we need an option (off by default) to not do this altogether...
if not env['WITHOUT_BF_INSTALL'] and not env['WITHOUT_BF_OVERWRITE_INSTALL']:
- scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
- if os.path.isdir(scriptsDir):
- print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
- shutil.rmtree(scriptsDir)
+ scriptsDir = os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts')
+ if os.path.isdir(scriptsDir):
+ print B.bc.OKGREEN + "Clearing installation directory%s: %s" % (B.bc.ENDC, os.path.abspath(scriptsDir))
+ shutil.rmtree(scriptsDir)
SetOption('num_jobs', int(env['BF_NUMJOBS']))
@@ -211,158 +211,158 @@
print B.bc.OKGREEN + "Build with debug symbols%s: %s" % (B.bc.ENDC, env['BF_DEBUG'])
if 'blenderlite' in B.targets:
- target_env_defs = {}
- target_env_defs['WITH_BF_GAMEENGINE'] = False
- target_env_defs['WITH_BF_OPENAL'] = False
- target_env_defs['WITH_BF_OPENEXR'] = False
- target_env_defs['WITH_BF_OPENMP'] = False
- target_env_defs['WITH_BF_ICONV'] = False
- target_env_defs['WITH_BF_INTERNATIONAL'] = False
- target_env_defs['WITH_BF_OPENJPEG'] = False
- target_env_defs['WITH_BF_FFMPEG'] = False
- target_env_defs['WITH_BF_QUICKTIME'] = False
- target_env_defs['WITH_BF_REDCODE'] = False
- target_env_defs['WITH_BF_DDS'] = False
- target_env_defs['WITH_BF_CINEON'] = False
- target_env_defs['WITH_BF_HDR'] = False
- target_env_defs['WITH_BF_ZLIB'] = False
- target_env_defs['WITH_BF_SDL'] = False
- target_env_defs['WITH_BF_JPEG'] = False
- target_env_defs['WITH_BF_PNG'] = False
- target_env_defs['WITH_BF_BULLET'] = False
- target_env_defs['WITH_BF_BINRELOC'] = False
- target_env_defs['BF_BUILDINFO'] = False
- target_env_defs['BF_NO_ELBEEM'] = True
- target_env_defs['WITH_BF_PYTHON'] = False
-
- # Merge blenderlite, let command line to override
- for k,v in target_env_defs.iteritems():
- if k not in B.arguments:
- env[k] = v
+ target_env_defs = {}
+ target_env_defs['WITH_BF_GAMEENGINE'] = False
+ target_env_defs['WITH_BF_OPENAL'] = False
+ target_env_defs['WITH_BF_OPENEXR'] = False
+ target_env_defs['WITH_BF_OPENMP'] = False
+ target_env_defs['WITH_BF_ICONV'] = False
+ target_env_defs['WITH_BF_INTERNATIONAL'] = False
+ target_env_defs['WITH_BF_OPENJPEG'] = False
+ target_env_defs['WITH_BF_FFMPEG'] = False
+ target_env_defs['WITH_BF_QUICKTIME'] = False
+ target_env_defs['WITH_BF_REDCODE'] = False
+ target_env_defs['WITH_BF_DDS'] = False
+ target_env_defs['WITH_BF_CINEON'] = False
+ target_env_defs['WITH_BF_HDR'] = False
+ target_env_defs['WITH_BF_ZLIB'] = False
+ target_env_defs['WITH_BF_SDL'] = False
+ target_env_defs['WITH_BF_JPEG'] = False
+ target_env_defs['WITH_BF_PNG'] = False
+ target_env_defs['WITH_BF_BULLET'] = False
+ target_env_defs['WITH_BF_BINRELOC'] = False
+ target_env_defs['BF_BUILDINFO'] = False
+ target_env_defs['BF_NO_ELBEEM'] = True
+ target_env_defs['WITH_BF_PYTHON'] = False
+
+ # Merge blenderlite, let command line to override
+ for k,v in target_env_defs.iteritems():
+ if k not in B.arguments:
+ env[k] = v
if env['WITH_BF_OPENMP'] == 1:
- if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
- env['CCFLAGS'].append('/openmp')
- env['CPPFLAGS'].append('/openmp')
- env['CXXFLAGS'].append('/openmp')
- else:
- if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
- env.Append(LINKFLAGS=['-openmp', '-static-intel'])
- env['CCFLAGS'].append('-openmp')
- env['CPPFLAGS'].append('-openmp')
- env['CXXFLAGS'].append('-openmp')
- else:
- env.Append(CCFLAGS=['-fopenmp'])
- env.Append(CPPFLAGS=['-fopenmp'])
- env.Append(CXXFLAGS=['-fopenmp'])
+ if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ env['CCFLAGS'].append('/openmp')
+ env['CPPFLAGS'].append('/openmp')
+ env['CXXFLAGS'].append('/openmp')
+ else:
+ if env['CC'].endswith('icc'): # to be able to handle CC=/opt/bla/icc case
+ env.Append(LINKFLAGS=['-openmp', '-static-intel'])
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list