[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37502] branches/soc-2011-garlic: merge from trunk r37405

xiao xiangquan xiaoxiangquan at gmail.com
Wed Jun 15 10:28:57 CEST 2011


Revision: 37502
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37502
Author:   xiaoxiangquan
Date:     2011-06-15 08:28:56 +0000 (Wed, 15 Jun 2011)
Log Message:
-----------
merge from trunk r37405

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37405

Modified Paths:
--------------
    branches/soc-2011-garlic/CMakeLists.txt
    branches/soc-2011-garlic/GNUmakefile
    branches/soc-2011-garlic/SConstruct
    branches/soc-2011-garlic/build_files/buildbot/master.cfg
    branches/soc-2011-garlic/build_files/buildbot/master_unpack.py
    branches/soc-2011-garlic/build_files/buildbot/slave_compile.py
    branches/soc-2011-garlic/build_files/buildbot/slave_pack.py
    branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake
    branches/soc-2011-garlic/build_files/cmake/example_scripts/cmake_linux_install.sh
    branches/soc-2011-garlic/build_files/cmake/macros.cmake
    branches/soc-2011-garlic/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-garlic/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-garlic/build_files/scons/tools/Blender.py
    branches/soc-2011-garlic/build_files/scons/tools/btools.py
    branches/soc-2011-garlic/doc/manpage/blender.1
    branches/soc-2011-garlic/extern/binreloc/CMakeLists.txt
    branches/soc-2011-garlic/extern/bullet2/CMakeLists.txt
    branches/soc-2011-garlic/extern/eltopo/CMakeLists.txt
    branches/soc-2011-garlic/extern/glew/CMakeLists.txt
    branches/soc-2011-garlic/extern/glew/include/GL/glew.h
    branches/soc-2011-garlic/extern/glew/include/GL/glxew.h
    branches/soc-2011-garlic/extern/glew/include/GL/wglew.h
    branches/soc-2011-garlic/extern/glew/src/glew.c
    branches/soc-2011-garlic/extern/libopenjpeg/CMakeLists.txt
    branches/soc-2011-garlic/extern/libredcode/CMakeLists.txt
    branches/soc-2011-garlic/extern/lzma/CMakeLists.txt
    branches/soc-2011-garlic/extern/lzo/CMakeLists.txt
    branches/soc-2011-garlic/intern/audaspace/CMakeLists.txt
    branches/soc-2011-garlic/intern/boolop/CMakeLists.txt
    branches/soc-2011-garlic/intern/bsp/CMakeLists.txt
    branches/soc-2011-garlic/intern/container/CMakeLists.txt
    branches/soc-2011-garlic/intern/decimation/CMakeLists.txt
    branches/soc-2011-garlic/intern/elbeem/CMakeLists.txt
    branches/soc-2011-garlic/intern/ghost/CMakeLists.txt
    branches/soc-2011-garlic/intern/ghost/intern/GHOST_ISystem.cpp
    branches/soc-2011-garlic/intern/ghost/intern/GHOST_NDOFManager.cpp
    branches/soc-2011-garlic/intern/guardedalloc/CMakeLists.txt
    branches/soc-2011-garlic/intern/iksolver/CMakeLists.txt
    branches/soc-2011-garlic/intern/itasc/CMakeLists.txt
    branches/soc-2011-garlic/intern/memutil/CMakeLists.txt
    branches/soc-2011-garlic/intern/mikktspace/CMakeLists.txt
    branches/soc-2011-garlic/intern/moto/CMakeLists.txt
    branches/soc-2011-garlic/intern/opennl/CMakeLists.txt
    branches/soc-2011-garlic/intern/smoke/CMakeLists.txt
    branches/soc-2011-garlic/intern/string/CMakeLists.txt
    branches/soc-2011-garlic/release/scripts/modules/bpy_extras/image_utils.py
    branches/soc-2011-garlic/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2011-garlic/release/scripts/modules/console/complete_namespace.py
    branches/soc-2011-garlic/release/scripts/modules/console/intellisense.py
    branches/soc-2011-garlic/release/scripts/modules/console_python.py
    branches/soc-2011-garlic/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-garlic/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_curve.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_object_constraint.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_text.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-garlic/release/windows/installer/00.sconsblender.nsi
    branches/soc-2011-garlic/source/blender/avi/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/blenfont/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-garlic/source/blender/blenkernel/BKE_brush.h
    branches/soc-2011-garlic/source/blender/blenkernel/BKE_deform.h
    branches/soc-2011-garlic/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-garlic/source/blender/blenkernel/BKE_multires.h
    branches/soc-2011-garlic/source/blender/blenkernel/BKE_texture.h
    branches/soc-2011-garlic/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/deform.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/node.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/object.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/seqeffects.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-garlic/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-garlic/source/blender/blenlib/BLI_math_geom.h
    branches/soc-2011-garlic/source/blender/blenlib/BLI_math_vector.h
    branches/soc-2011-garlic/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2011-garlic/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/blenlib/intern/math_base_inline.c
    branches/soc-2011-garlic/source/blender/blenlib/intern/math_geom.c
    branches/soc-2011-garlic/source/blender/blenlib/intern/math_vector_inline.c
    branches/soc-2011-garlic/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-garlic/source/blender/blenloader/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-garlic/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-garlic/source/blender/blenpluginapi/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/collada/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/collada/EffectExporter.cpp
    branches/soc-2011-garlic/source/blender/editors/animation/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/animation/SConscript
    branches/soc-2011-garlic/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-garlic/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-garlic/source/blender/editors/animation/anim_ops.c
    branches/soc-2011-garlic/source/blender/editors/armature/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/armature/SConscript
    branches/soc-2011-garlic/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/curve/SConscript
    branches/soc-2011-garlic/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/gpencil/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-garlic/source/blender/editors/include/ED_particle.h
    branches/soc-2011-garlic/source/blender/editors/include/ED_screen.h
    branches/soc-2011-garlic/source/blender/editors/include/ED_types.h
    branches/soc-2011-garlic/source/blender/editors/include/ED_util.h
    branches/soc-2011-garlic/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-garlic/source/blender/editors/include/UI_interface.h
    branches/soc-2011-garlic/source/blender/editors/include/UI_interface_icons.h
    branches/soc-2011-garlic/source/blender/editors/interface/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/interface/interface.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-garlic/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-garlic/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-garlic/source/blender/editors/interface/resources.c
    branches/soc-2011-garlic/source/blender/editors/interface/view2d_ops.c
    branches/soc-2011-garlic/source/blender/editors/mesh/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/mesh/SConscript
    branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_loop.c
    branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_mods.c
    branches/soc-2011-garlic/source/blender/editors/metaball/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/object/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/object/SConscript
    branches/soc-2011-garlic/source/blender/editors/object/object_add.c
    branches/soc-2011-garlic/source/blender/editors/object/object_bake.c
    branches/soc-2011-garlic/source/blender/editors/object/object_modifier.c
    branches/soc-2011-garlic/source/blender/editors/object/object_shapekey.c
    branches/soc-2011-garlic/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-garlic/source/blender/editors/physics/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/physics/SConscript
    branches/soc-2011-garlic/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-garlic/source/blender/editors/render/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/render/render_view.c
    branches/soc-2011-garlic/source/blender/editors/screen/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/screen/area.c
    branches/soc-2011-garlic/source/blender/editors/screen/screen_edit.c
    branches/soc-2011-garlic/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_intern.h
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_utils.c
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-garlic/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-garlic/source/blender/editors/sound/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_action/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_action/action_select.c
    branches/soc-2011-garlic/source/blender/editors/space_action/space_action.c
    branches/soc-2011-garlic/source/blender/editors/space_api/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_api/spacetypes.c
    branches/soc-2011-garlic/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_buttons/buttons_header.c
    branches/soc-2011-garlic/source/blender/editors/space_console/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_file/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_file/file_draw.c
    branches/soc-2011-garlic/source/blender/editors/space_file/file_intern.h
    branches/soc-2011-garlic/source/blender/editors/space_file/file_ops.c
    branches/soc-2011-garlic/source/blender/editors/space_file/file_panels.c
    branches/soc-2011-garlic/source/blender/editors/space_file/filelist.c
    branches/soc-2011-garlic/source/blender/editors/space_file/filesel.c
    branches/soc-2011-garlic/source/blender/editors/space_graph/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_graph/SConscript
    branches/soc-2011-garlic/source/blender/editors/space_graph/graph_select.c
    branches/soc-2011-garlic/source/blender/editors/space_image/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-garlic/source/blender/editors/space_image/image_ops.c
    branches/soc-2011-garlic/source/blender/editors/space_info/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-garlic/source/blender/editors/space_info/info_report.c
    branches/soc-2011-garlic/source/blender/editors/space_logic/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_logic/SConscript
    branches/soc-2011-garlic/source/blender/editors/space_logic/logic_buttons.c
    branches/soc-2011-garlic/source/blender/editors/space_nla/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_nla/nla_select.c
    branches/soc-2011-garlic/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-garlic/source/blender/editors/space_node/node_select.c
    branches/soc-2011-garlic/source/blender/editors/space_node/space_node.c
    branches/soc-2011-garlic/source/blender/editors/space_outliner/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner.c
    branches/soc-2011-garlic/source/blender/editors/space_script/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_script/script_header.c
    branches/soc-2011-garlic/source/blender/editors/space_sequencer/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_sequencer/SConscript
    branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_select.c
    branches/soc-2011-garlic/source/blender/editors/space_sound/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_sound/sound_header.c
    branches/soc-2011-garlic/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_time/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_userpref/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_view3d/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-garlic/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c
    branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-garlic/source/blender/editors/transform/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/transform/transform.c
    branches/soc-2011-garlic/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-garlic/source/blender/editors/util/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/util/editmode_undo.c
    branches/soc-2011-garlic/source/blender/editors/util/undo.c
    branches/soc-2011-garlic/source/blender/editors/util/util_intern.h
    branches/soc-2011-garlic/source/blender/editors/uvedit/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/editors/uvedit/SConscript
    branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2011-garlic/source/blender/gpu/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-garlic/source/blender/ikplugin/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/imbuf/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2011-garlic/source/blender/imbuf/intern/cineon/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/imbuf/intern/dds/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/imbuf/intern/divers.c
    branches/soc-2011-garlic/source/blender/imbuf/intern/filter.c
    branches/soc-2011-garlic/source/blender/imbuf/intern/openexr/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/imbuf/intern/targa.c
    branches/soc-2011-garlic/source/blender/makesdna/DNA_lattice_types.h
    branches/soc-2011-garlic/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-garlic/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2011-garlic/source/blender/makesdna/DNA_sequence_types.h
    branches/soc-2011-garlic/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-garlic/source/blender/makesdna/intern/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/makesrna/RNA_access.h
    branches/soc-2011-garlic/source/blender/makesrna/RNA_define.h
    branches/soc-2011-garlic/source/blender/makesrna/RNA_types.h
    branches/soc-2011-garlic/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_color.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_fcurve.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_image.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_internal_types.h
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_lamp.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_lattice.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_main.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_material.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_smoke.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-garlic/source/blender/makesrna/intern/rna_world.c
    branches/soc-2011-garlic/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_cloth.c
    branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_meshdeform.c
    branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_none.c
    branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_smoke.c
    branches/soc-2011-garlic/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/nodes/intern/CMP_nodes/CMP_colorMatte.c
    branches/soc-2011-garlic/source/blender/nodes/intern/CMP_nodes/CMP_math.c
    branches/soc-2011-garlic/source/blender/nodes/intern/CMP_util.c
    branches/soc-2011-garlic/source/blender/nodes/intern/SHD_nodes/SHD_material.c
    branches/soc-2011-garlic/source/blender/nodes/intern/SHD_util.h
    branches/soc-2011-garlic/source/blender/python/BPY_extern.h
    branches/soc-2011-garlic/source/blender/python/generic/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/python/generic/bgl.c
    branches/soc-2011-garlic/source/blender/python/generic/bgl.h
    branches/soc-2011-garlic/source/blender/python/generic/bpy_internal_import.c
    branches/soc-2011-garlic/source/blender/python/generic/mathutils_Color.c
    branches/soc-2011-garlic/source/blender/python/generic/mathutils_Euler.c
    branches/soc-2011-garlic/source/blender/python/generic/mathutils_Matrix.c
    branches/soc-2011-garlic/source/blender/python/generic/mathutils_Vector.c
    branches/soc-2011-garlic/source/blender/python/generic/mathutils_geometry.c
    branches/soc-2011-garlic/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/python/intern/bpy.c
    branches/soc-2011-garlic/source/blender/python/intern/bpy.h
    branches/soc-2011-garlic/source/blender/python/intern/bpy_app.h
    branches/soc-2011-garlic/source/blender/python/intern/bpy_driver.c
    branches/soc-2011-garlic/source/blender/python/intern/bpy_library.c
    branches/soc-2011-garlic/source/blender/python/intern/bpy_props.c
    branches/soc-2011-garlic/source/blender/python/intern/bpy_props.h
    branches/soc-2011-garlic/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-garlic/source/blender/python/intern/bpy_rna.h
    branches/soc-2011-garlic/source/blender/quicktime/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/render/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/render/intern/include/render_types.h
    branches/soc-2011-garlic/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-garlic/source/blender/render/intern/source/envmap.c
    branches/soc-2011-garlic/source/blender/render/intern/source/imagetexture.c
    branches/soc-2011-garlic/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-garlic/source/blender/render/intern/source/pixelshading.c
    branches/soc-2011-garlic/source/blender/render/intern/source/pointdensity.c
    branches/soc-2011-garlic/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-garlic/source/blender/render/intern/source/sunsky.c
    branches/soc-2011-garlic/source/blender/render/intern/source/volumetric.c
    branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt
    branches/soc-2011-garlic/source/blender/windowmanager/SConscript
    branches/soc-2011-garlic/source/blender/windowmanager/WM_api.h
    branches/soc-2011-garlic/source/blender/windowmanager/WM_types.h
    branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_apple.c
    branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2011-garlic/source/blenderplayer/CMakeLists.txt
    branches/soc-2011-garlic/source/blenderplayer/bad_level_call_stubs/CMakeLists.txt
    branches/soc-2011-garlic/source/creator/CMakeLists.txt
    branches/soc-2011-garlic/source/creator/SConscript
    branches/soc-2011-garlic/source/creator/creator.c
    branches/soc-2011-garlic/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-garlic/source/gameengine/BlenderRoutines/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-garlic/source/gameengine/Converter/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-garlic/source/gameengine/Expressions/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/GameLogic/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/GamePlayer/common/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-garlic/source/gameengine/Ketsji/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Ketsji/KXNetwork/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Network/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Network/LoopBackNetwork/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Physics/Bullet/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Physics/Dummy/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Physics/common/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Rasterizer/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/SceneGraph/CMakeLists.txt
    branches/soc-2011-garlic/source/gameengine/VideoTexture/CMakeLists.txt
    branches/soc-2011-garlic/source/tests/CMakeLists.txt
    branches/soc-2011-garlic/source/tests/bl_load_py_modules.py

Added Paths:
-----------
    branches/soc-2011-garlic/intern/ghost/intern/GHOST_DisplayManagerNULL.h
    branches/soc-2011-garlic/intern/ghost/intern/GHOST_SystemNULL.h
    branches/soc-2011-garlic/intern/ghost/intern/GHOST_WindowNULL.h
    branches/soc-2011-garlic/release/bin/.blender/fonts/
    branches/soc-2011-garlic/release/bin/.blender/fonts/unifont.ttf.gz

Removed Paths:
-------------
    branches/soc-2011-garlic/release/datafiles/fonts/

Modified: branches/soc-2011-garlic/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/CMakeLists.txt	2011-06-15 06:42:46 UTC (rev 37501)
+++ branches/soc-2011-garlic/CMakeLists.txt	2011-06-15 08:28:56 UTC (rev 37502)
@@ -98,6 +98,10 @@
 option(WITH_BULLET        "Enable Bullet (Physics Engine)" ON)
 option(WITH_GAMEENGINE    "Enable Game Engine" ON)
 option(WITH_PLAYER        "Build Player" OFF)
+
+option(WITH_HEADLESS      "Build without graphical support (renderfarm, server mode only)" OFF)
+mark_as_advanced(WITH_HEADLESS)
+
 # (unix defaults to OpenMP On)
 if(UNIX AND NOT APPLE)
 	option(WITH_OPENMP        "Enable OpenMP (has to be supported by the compiler)" ON)
@@ -184,6 +188,9 @@
 	option(WITH_LIBS10.5  "Use 10.5 libs (needed for 64bit builds)" OFF)
 endif()
 
+#-----------------------------------------------------------------------------
+# Check for conflicting/unsupported configurations
+
 if(NOT WITH_GAMEENGINE AND WITH_PLAYER)
 	message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
 endif()
@@ -205,6 +212,17 @@
 	message(FATAL_ERROR "WITH_PYTHON_MODULE requires WITH_PYTHON_INSTALL to be OFF")
 endif()
 
+if(WITH_CODEC_QUICKTIME AND MINGW)
+	message(FATAL_ERROR "MINGW requires WITH_CODEC_QUICKTIME to be OFF "
+						"because it is currently unsupported, remove this "
+						"line if youre a developer who wants to add support.")
+endif()
+
+# may as well build python module without a UI
+if(WITH_PYTHON_MODULE)
+	set(WITH_HEADLESS ON)
+endif()
+
 # remove old vars
 unset(WITH_INSTALL CACHE)
 
@@ -409,15 +427,19 @@
 		unset(JEMALLOC)
 	endif()
 
-	find_package(X11 REQUIRED)
-	find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
-	mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
-
 	# OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed
-	set(LLIBS "-lutil -lc -lm -lpthread -lstdc++ ${X11_X11_LIB}")
+	set(LLIBS "-lutil -lc -lm -lpthread -lstdc++")
 
-	if(WITH_X11_XINPUT)
-		list(APPEND LLIBS ${X11_Xinput_LIB})
+	if(NOT WITH_HEADLESS)
+		find_package(X11 REQUIRED)
+		find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH})
+		mark_as_advanced(X11_XF86keysym_INCLUDE_PATH)
+
+		list(APPEND LLIBS ${X11_X11_LIB})
+
+		if(WITH_X11_XINPUT)
+			list(APPEND LLIBS ${X11_Xinput_LIB})
+		endif()
 	endif()
 
 	if(CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -1019,7 +1041,7 @@
 #-----------------------------------------------------------------------------
 # Configure OpenGL.
 find_package(OpenGL)
-blender_include_dirs("${OPENGL_INCLUDE_DIR}")
+blender_include_dirs_sys("${OPENGL_INCLUDE_DIR}")
 # unset(OPENGL_LIBRARIES CACHE) # not compat with older cmake 
 # unset(OPENGL_xmesa_INCLUDE_DIR CACHE) # not compat with older cmake 
 

Modified: branches/soc-2011-garlic/GNUmakefile
===================================================================
--- branches/soc-2011-garlic/GNUmakefile	2011-06-15 06:42:46 UTC (rev 37501)
+++ branches/soc-2011-garlic/GNUmakefile	2011-06-15 08:28:56 UTC (rev 37502)
@@ -64,21 +64,19 @@
 
 # Build Blender
 all:
-	@echo 
+	@echo
 	@echo Configuring Blender ...
 
 	if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
-		mkdir -p $(BUILD_DIR) ; \
-		cd $(BUILD_DIR) ; \
-		cmake $(BLENDER_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+		cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
 	fi
 
-	@echo 
+	@echo
 	@echo Building Blender ...
-	cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
-	@echo 
+	make -C $(BUILD_DIR) -s -j $(NPROCS) install
+	@echo
 	@echo run blender from "$(BUILD_DIR)/bin/blender"
-	@echo 
+	@echo
 
 debug: all
 	# pass
@@ -91,7 +89,7 @@
 	cd build_files/package_spec/pacman ; MAKEFLAGS="-j$(NPROCS)" makepkg --asroot
 
 package_archive:
-	cd $(BUILD_DIR) ; make -s package_archive
+	make -C $(BUILD_DIR) -s package_archive
 	@echo archive in "$(BUILD_DIR)/release"
 
 # forward build targets
@@ -109,6 +107,6 @@
 	@echo "written: test_cmake_consistency.log"
 
 clean:
-	cd $(BUILD_DIR) ; make clean
+	make -C $(BUILD_DIR) clean
 
 .PHONY: all

Modified: branches/soc-2011-garlic/SConstruct
===================================================================
--- branches/soc-2011-garlic/SConstruct	2011-06-15 06:42:46 UTC (rev 37501)
+++ branches/soc-2011-garlic/SConstruct	2011-06-15 08:28:56 UTC (rev 37502)
@@ -306,10 +306,6 @@
     env['CXXFLAGS'].append('-DDISABLE_ELBEEM')
     env['CCFLAGS'].append('-DDISABLE_ELBEEM')
 
-if env['WITH_BF_SDL'] == False and env['OURPLATFORM'] in ('win32-vc', 'win32-ming', 'win64-vc'):
-    env['PLATFORM_LINKFLAGS'].remove('/ENTRY:mainCRTStartup')
-    env['PLATFORM_LINKFLAGS'].append('/ENTRY:main')
-
 # lastly we check for root_build_dir ( we should not do before, otherwise we might do wrong builddir
 B.root_build_dir = env['BF_BUILDDIR']
 B.doc_build_dir = os.path.join(env['BF_INSTALLDIR'], 'doc')
@@ -409,17 +405,18 @@
     B.propose_priorities()
 
 dobj = B.buildinfo(env, "dynamic") + B.resources
+creob = B.creator(env)
 thestatlibs, thelibincs = B.setup_staticlibs(env)
 thesyslibs = B.setup_syslibs(env)
 
 if 'blender' in B.targets or not env['WITH_BF_NOBLENDER']:
-    env.BlenderProg(B.root_build_dir, "blender", mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
+    env.BlenderProg(B.root_build_dir, "blender", creob + mainlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blender')
 if env['WITH_BF_PLAYER']:
     playerlist = B.create_blender_liblist(env, 'player')
     playerlist += B.create_blender_liblist(env, 'player2')
     playerlist += B.create_blender_liblist(env, 'intern')
     playerlist += B.create_blender_liblist(env, 'extern')
-    env.BlenderProg(B.root_build_dir, "blenderplayer",  playerlist + thestatlibs + dobj, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
+    env.BlenderProg(B.root_build_dir, "blenderplayer", dobj + playerlist + thestatlibs, thesyslibs, [B.root_build_dir+'/lib'] + thelibincs, 'blenderplayer')
 
 ##### Now define some targets
 

Modified: branches/soc-2011-garlic/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-garlic/build_files/buildbot/master.cfg	2011-06-15 06:42:46 UTC (rev 37501)
+++ branches/soc-2011-garlic/build_files/buildbot/master.cfg	2011-06-15 08:28:56 UTC (rev 37502)
@@ -53,7 +53,7 @@
 buildernames = []
 
 
-def add_builder(c, name, libdir, factory):
+def add_builder(c, name, libdir, factory, branch=''):
     slavenames = []
 
     for slave in master_private.slaves:
@@ -61,24 +61,26 @@
             slavenames.append(slave['name'])
 
     if len(slavenames) > 0:
-        f = factory(name, libdir)
+        f = factory(name, libdir, branch)
         c['builders'].append(BuilderConfig(name=name, slavenames=slavenames, factory=f, category='blender'))
         buildernames.append(name)
 
 # common steps
 
 
-def svn_step():
-    return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
+def svn_step(branch=''):
+    if branch:
+        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/branches/%%BRANCH%%', mode='update', defaultBranch=branch, workdir='blender')
+    else:
+        return SVN(baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/blender', mode='update', defaultBranch='trunk', workdir='blender')
 
-
 def lib_svn_step(dir):
     return SVN(name='lib svn', baseURL='https://svn.blender.org/svnroot/bf-blender/%%BRANCH%%/lib/' + dir, mode='update', defaultBranch='trunk', workdir='lib/' + dir)
 
 # generic builder
 
 
-def generic_builder(id, libdir=""):
+def generic_builder(id, libdir='', branch=''):
     filename = 'buildbot_upload_' + id + '.zip'
     compile_script = '../blender/build_files/buildbot/slave_compile.py'
     test_script = '../blender/build_files/buildbot/slave_test.py'
@@ -86,13 +88,13 @@
     unpack_script = 'master_unpack.py'
 
     f = BuildFactory()
-    f.addStep(svn_step())
+    f.addStep(svn_step(branch))
     if libdir != '':
         f.addStep(lib_svn_step(libdir))
 
     f.addStep(Compile(command=['python', compile_script, id]))
     f.addStep(Test(command=['python', test_script, id]))
-    f.addStep(ShellCommand(name='package', command=['python', pack_script, id], description='packaging', descriptionDone='packaged'))
+    f.addStep(ShellCommand(name='package', command=['python', pack_script, id, branch], description='packaging', descriptionDone='packaged'))
     if id.find('cmake') != -1:
         f.addStep(FileUpload(name='upload', slavesrc='buildbot_upload.zip', masterdest=filename, maxsize=100 * 1024 * 1024))
     else:
@@ -102,12 +104,19 @@
 
 # builders
 
-add_builder(c, 'mac_x86_64_cmake', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_i386_cmake', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'mac_ppc_cmake', 'darwin-9.x.universal', generic_builder)
-add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
+add_builder(c, 'mac_x86_64_scons', 'darwin-9.x.universal', generic_builder)
+add_builder(c, 'salad_mac_x86_64_scons', 'darwin-9.x.universal', generic_builder, 'soc-2011-salad')
+add_builder(c, 'mac_i386_scons', 'darwin-9.x.universal', generic_builder)
+add_builder(c, 'mac_ppc_scons', 'darwin-9.x.universal', generic_builder)
+#add_builder(c, 'linux_x86_64_cmake', '', generic_builder)
+add_builder(c, 'linux_i386_scons', '', generic_builder)
+add_builder(c, 'salad_linux_i386_scons', '', generic_builder, 'soc-2011-salad')
 add_builder(c, 'linux_x86_64_scons', '', generic_builder)
+add_builder(c, 'salad_linux_x86_64_scons', '', generic_builder, 'soc-2011-salad')
 add_builder(c, 'win32_scons', 'windows', generic_builder)
+add_builder(c, 'salad_win32_scons', 'windows', generic_builder, 'soc-2011-salad')
+#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
+#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
 
 # SCHEDULERS
 #
@@ -149,7 +158,7 @@
     pingBuilder=False,
     stopBuild=False,
     stopAllBuilds=False,
-    cancelPendingBuild=False,
+    cancelPendingBuild=True,
 )
 
 c['status'].append(html.WebStatus(http_port=8010, authz=authz_cfg))

Modified: branches/soc-2011-garlic/build_files/buildbot/master_unpack.py
===================================================================

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list