[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39592] branches/soc-2011-carrot: Merge with trunk r39589
Miika Hamalainen
miika.hamalainen at kolumbus.fi
Sun Aug 21 21:37:20 CEST 2011
Revision: 39592
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39592
Author: miikah
Date: 2011-08-21 19:37:19 +0000 (Sun, 21 Aug 2011)
Log Message:
-----------
Merge with trunk r39589
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39589
Modified Paths:
--------------
branches/soc-2011-carrot/CMakeLists.txt
branches/soc-2011-carrot/GNUmakefile
branches/soc-2011-carrot/SConstruct
branches/soc-2011-carrot/build_files/buildbot/master.cfg
branches/soc-2011-carrot/build_files/buildbot/slave_compile.py
branches/soc-2011-carrot/build_files/buildbot/slave_pack.py
branches/soc-2011-carrot/build_files/cmake/macros.cmake
branches/soc-2011-carrot/build_files/scons/config/darwin-config.py
branches/soc-2011-carrot/build_files/scons/tools/Blender.py
branches/soc-2011-carrot/build_files/scons/tools/btools.py
branches/soc-2011-carrot/doc/build_systems/scons-dev.txt
branches/soc-2011-carrot/doc/build_systems/scons.txt
branches/soc-2011-carrot/doc/doxygen/Doxyfile
branches/soc-2011-carrot/doc/python_api/rst/bge.logic.rst
branches/soc-2011-carrot/extern/bullet2/src/SConscript
branches/soc-2011-carrot/extern/eltopo/SConscript
branches/soc-2011-carrot/intern/ghost/CMakeLists.txt
branches/soc-2011-carrot/intern/ghost/SConscript
branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManager.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManagerX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_NDOFManagerX11.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemCocoa.mm
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemWin32.h
branches/soc-2011-carrot/intern/ghost/intern/GHOST_SystemX11.cpp
branches/soc-2011-carrot/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2011-carrot/release/scripts/modules/addon_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy/__init__.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpy_extras/mesh_utils.py
branches/soc-2011-carrot/release/scripts/modules/bpyml.py
branches/soc-2011-carrot/release/scripts/modules/bpyml_ui.py
branches/soc-2011-carrot/release/scripts/modules/rna_info.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/animsys_update.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/image.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/nla.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_align.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_quick_effects.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_randomize_transform.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/presets.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/screen_play_rendered_anim.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/sequencer.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_follow_active.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_lightmap.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-carrot/release/scripts/startup/bl_operators/wm.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/__init__.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_curve.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object_constraint.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_cloth.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_softbody.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_scene.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_console.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_dopesheet.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_filebrowser.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_graph.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_image.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_logic.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_nla.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_text.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_time.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref_keymap.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-carrot/release/scripts/templates/addon_add_object.py
branches/soc-2011-carrot/release/scripts/templates/operator_export.py
branches/soc-2011-carrot/release/scripts/templates/operator_mesh_add.py
branches/soc-2011-carrot/release/scripts/templates/operator_modal.py
branches/soc-2011-carrot/release/scripts/templates/operator_modal_draw.py
branches/soc-2011-carrot/release/scripts/templates/operator_modal_timer.py
branches/soc-2011-carrot/release/scripts/templates/operator_modal_view3d.py
branches/soc-2011-carrot/release/text/readme.html
branches/soc-2011-carrot/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-carrot/source/blender/blenkernel/BKE_modifier.h
branches/soc-2011-carrot/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/anim.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/blender.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/cloth.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/depsgraph.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/displist.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/modifier.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/nla.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/particle.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/sequencer.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/unit.c
branches/soc-2011-carrot/source/blender/blenkernel/intern/writeffmpeg.c
branches/soc-2011-carrot/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-carrot/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-carrot/source/blender/blenlib/intern/BLI_ghash.c
branches/soc-2011-carrot/source/blender/blenlib/intern/jitter.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_geom.c
branches/soc-2011-carrot/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-carrot/source/blender/blenlib/intern/rct.c
branches/soc-2011-carrot/source/blender/blenlib/intern/scanfill.c
branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
branches/soc-2011-carrot/source/blender/blenloader/intern/writefile.c
branches/soc-2011-carrot/source/blender/blenpluginapi/SConscript
branches/soc-2011-carrot/source/blender/editors/armature/SConscript
branches/soc-2011-carrot/source/blender/editors/armature/poseSlide.c
branches/soc-2011-carrot/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-carrot/source/blender/editors/include/ED_node.h
branches/soc-2011-carrot/source/blender/editors/include/ED_object.h
branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
branches/soc-2011-carrot/source/blender/editors/interface/interface.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_draw.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_handlers.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_icons.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
branches/soc-2011-carrot/source/blender/editors/interface/interface_layout.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_regions.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_style.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_utils.c
branches/soc-2011-carrot/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-carrot/source/blender/editors/interface/resources.c
branches/soc-2011-carrot/source/blender/editors/mesh/SConscript
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-carrot/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-carrot/source/blender/editors/object/SConscript
branches/soc-2011-carrot/source/blender/editors/object/object_add.c
branches/soc-2011-carrot/source/blender/editors/object/object_bake.c
branches/soc-2011-carrot/source/blender/editors/object/object_edit.c
branches/soc-2011-carrot/source/blender/editors/object/object_relations.c
branches/soc-2011-carrot/source/blender/editors/object/object_transform.c
branches/soc-2011-carrot/source/blender/editors/physics/SConscript
branches/soc-2011-carrot/source/blender/editors/render/SConscript
branches/soc-2011-carrot/source/blender/editors/render/render_shading.c
branches/soc-2011-carrot/source/blender/editors/render/render_update.c
branches/soc-2011-carrot/source/blender/editors/screen/SConscript
branches/soc-2011-carrot/source/blender/editors/screen/area.c
branches/soc-2011-carrot/source/blender/editors/sculpt_paint/SConscript
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_context.c
branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_header.c
branches/soc-2011-carrot/source/blender/editors/space_console/console_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/SConscript
branches/soc-2011-carrot/source/blender/editors/space_file/file_ops.c
branches/soc-2011-carrot/source/blender/editors/space_file/filelist.c
branches/soc-2011-carrot/source/blender/editors/space_image/image_ops.c
branches/soc-2011-carrot/source/blender/editors/space_info/info_ops.c
branches/soc-2011-carrot/source/blender/editors/space_nla/nla_edit.c
branches/soc-2011-carrot/source/blender/editors/space_node/SConscript
branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_header.c
branches/soc-2011-carrot/source/blender/editors/space_node/node_intern.h
branches/soc-2011-carrot/source/blender/editors/space_node/node_select.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_intern.h
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_ops.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_add.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_intern.h
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_ops.c
branches/soc-2011-carrot/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-carrot/source/blender/editors/space_text/text_python.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_toolbar.c
branches/soc-2011-carrot/source/blender/editors/transform/CMakeLists.txt
branches/soc-2011-carrot/source/blender/editors/transform/transform.c
branches/soc-2011-carrot/source/blender/editors/transform/transform.h
branches/soc-2011-carrot/source/blender/editors/transform/transform_generics.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_ops.c
branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-carrot/source/blender/gpu/GPU_extensions.h
branches/soc-2011-carrot/source/blender/imbuf/intern/anim_movie.c
branches/soc-2011-carrot/source/blender/imbuf/intern/filter.c
branches/soc-2011-carrot/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_sdna_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-carrot/source/blender/makesdna/DNA_windowmanager_types.h
branches/soc-2011-carrot/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/makesdna/intern/SConscript
branches/soc-2011-carrot/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
branches/soc-2011-carrot/source/blender/makesrna/RNA_types.h
branches/soc-2011-carrot/source/blender/makesrna/SConscript
branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-carrot/source/blender/makesrna/intern/SConscript
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_cloth.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_constraint.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_internal.h
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_modifier.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sensor.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_smoke.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_wm.c
branches/soc-2011-carrot/source/blender/makesrna/intern/rna_wm_api.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_armature.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_boolean.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_build.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_collision.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_curve.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_explode.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_fluidsim.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_lattice.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_mask.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_multires.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_none.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_particlesystem.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_shapekey.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_shrinkwrap.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_simpledeform.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_smoke.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_smooth.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_softbody.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_subsurf.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_surface.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-carrot/source/blender/nodes/SConscript
branches/soc-2011-carrot/source/blender/python/generic/noise_py_api.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_operator.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.h
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_anim.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_rna_array.c
branches/soc-2011-carrot/source/blender/python/intern/bpy_util.h
branches/soc-2011-carrot/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2011-carrot/source/blender/render/SConscript
branches/soc-2011-carrot/source/blender/render/intern/source/convertblender.c
branches/soc-2011-carrot/source/blender/render/intern/source/envmap.c
branches/soc-2011-carrot/source/blender/render/intern/source/gammaCorrectionTables.c
branches/soc-2011-carrot/source/blender/render/intern/source/initrender.c
branches/soc-2011-carrot/source/blender/render/intern/source/occlusion.c
branches/soc-2011-carrot/source/blender/render/intern/source/pixelblending.c
branches/soc-2011-carrot/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-carrot/source/blender/render/intern/source/rayshade.c
branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
branches/soc-2011-carrot/source/blender/render/intern/source/rendercore.c
branches/soc-2011-carrot/source/blender/render/intern/source/renderdatabase.c
branches/soc-2011-carrot/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-carrot/source/blender/render/intern/source/sss.c
branches/soc-2011-carrot/source/blender/render/intern/source/strand.c
branches/soc-2011-carrot/source/blender/render/intern/source/sunsky.c
branches/soc-2011-carrot/source/blender/render/intern/source/volume_precache.c
branches/soc-2011-carrot/source/blender/render/intern/source/volumetric.c
branches/soc-2011-carrot/source/blender/render/intern/source/voxeldata.c
branches/soc-2011-carrot/source/blender/render/intern/source/zbuf.c
branches/soc-2011-carrot/source/blender/windowmanager/CMakeLists.txt
branches/soc-2011-carrot/source/blender/windowmanager/SConscript
branches/soc-2011-carrot/source/blender/windowmanager/WM_api.h
branches/soc-2011-carrot/source/blender/windowmanager/WM_types.h
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_files.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_keymap.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-carrot/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-carrot/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2011-carrot/source/tests/CMakeLists.txt
branches/soc-2011-carrot/source/tests/bl_run_operators.py
branches/soc-2011-carrot/source/tools/CTS/FBlender.py
Added Paths:
-----------
branches/soc-2011-carrot/build_files/cmake/config/
branches/soc-2011-carrot/build_files/cmake/config/blender_headless.cmake
branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-carrot/build_files/cmake/config/bpy_module.cmake
branches/soc-2011-carrot/build_files/scons/config/linux-config.py
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-carrot/source/blender/windowmanager/WM_keymap.h
Removed Paths:
-------------
branches/soc-2011-carrot/build_files/cmake/config/blender_headless.cmake
branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake
branches/soc-2011-carrot/build_files/cmake/config/bpy_module.cmake
branches/soc-2011-carrot/build_files/scons/config/linux2-config.py
branches/soc-2011-carrot/source/blender/editors/space_outliner/outliner.c
branches/soc-2011-carrot/source/blender/editors/transform/transform_ndofinput.c
Property Changed:
----------------
branches/soc-2011-carrot/
branches/soc-2011-carrot/intern/audaspace/OpenAL/
branches/soc-2011-carrot/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:36828-39062
+ /trunk/blender:36828-39589
Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt 2011-08-21 19:25:56 UTC (rev 39591)
+++ branches/soc-2011-carrot/CMakeLists.txt 2011-08-21 19:37:19 UTC (rev 39592)
@@ -499,6 +499,9 @@
# GNU Compiler
if(CMAKE_COMPILER_IS_GNUCC)
set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
+ # CLang is the same as GCC for now.
+ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ set(PLATFORM_CFLAGS "-pipe -fPIC -funsigned-char -fno-strict-aliasing")
# Intel C++ Compiler
elseif(CMAKE_C_COMPILER_ID MATCHES "Intel")
# think these next two are broken
@@ -1010,6 +1013,10 @@
if(NOT 3D_CONNEXION_CLIENT_LIBRARY)
set(WITH_INPUT_NDOF OFF)
endif()
+
+ if(WITH_INPUT_NDOF)
+ set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient")
+ endif()
endif()
else()
Modified: branches/soc-2011-carrot/GNUmakefile
===================================================================
--- branches/soc-2011-carrot/GNUmakefile 2011-08-21 19:25:56 UTC (rev 39591)
+++ branches/soc-2011-carrot/GNUmakefile 2011-08-21 19:37:19 UTC (rev 39592)
@@ -35,17 +35,33 @@
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+BUILD_TYPE:=Release
+BUILD_CMAKE_ARGS:=""
+# -----------------------------------------------------------------------------
+# additional targets for the build configuration
+
# support 'make debug'
ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_debug
BUILD_TYPE:=Debug
-else
- BUILD_TYPE:=Release
endif
+ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_lite
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake
+endif
+ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_bpy
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
+endif
+ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_bpy
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS) -C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
+endif
+# -----------------------------------------------------------------------------
# Get the number of cores for threaded build
NPROCS:=1
ifeq ($(OS), Linux)
@@ -61,14 +77,14 @@
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
-
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- cmake -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+ cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
fi
@echo
@@ -80,9 +96,40 @@
@echo
debug: all
- # pass
+lite: all
+headless: all
+bpy: all
-# package types
+# -----------------------------------------------------------------------------
+# Helo for build targets
+help:
+ @echo ""
+ @echo "Convenience targets provided for building blender, (multiple at once can be used)"
+ @echo " * debug - build a debug binary"
+ @echo " * lite - disable non essential features for a smaller binary and faster build"
+ @echo " * headless - build without an interface (renderfarm or server automation)"
+ @echo " * bpy - build as a python module which can be loaded from python directly"
+ @echo ""
+ @echo "Project Files for IDE's"
+ @echo " * project_qtcreator - QtCreator Project Files"
+ @echo " * project_netbeans - NetBeans Project Files"
+ @echo " * project_eclipse - Eclipse CDT4 Project Files"
+ @echo ""
+ @echo "Package Targets"
+ @echo " * package_debian - build a debian package"
+ @echo " * package_pacman - build an arch linux pacmanpackage"
+ @echo " * package_archive - build an archive package"
+ @echo ""
+ @echo "Testing Targets (not assosiated with building blender)"
+ @echo " * test - run ctest, currently tests import/export, operator execution and that python modules load"
+ @echo " * test_cmake - runs our own cmake file checker which detects errors in the cmake file list definitions"
+ @echo " * test_pep8 - checks all python script are pep8 which are tagged to use the stricter formatting"
+ @echo " * test_deprecated - checks for deprecation tags in our code which may need to be removed"
+ @echo ""
+
+# -----------------------------------------------------------------------------
+# Packages
+#
package_debian:
cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh ./build_debian.sh
@@ -93,7 +140,10 @@
make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release"
-# forward build targets
+
+# -----------------------------------------------------------------------------
+# Tests
+#
test:
cd $(BUILD_DIR) ; ctest . --output-on-failure
@@ -111,6 +161,21 @@
test_deprecated:
python3 source/tests/check_deprecated.py
+
+# -----------------------------------------------------------------------------
+# Project Files
+#
+
+project_qtcreator:
+ python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+
+project_netbeans:
+ python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+
+project_eclipse:
+ cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/soc-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct 2011-08-21 19:25:56 UTC (rev 39591)
+++ branches/soc-2011-carrot/SConstruct 2011-08-21 19:37:19 UTC (rev 39592)
@@ -166,6 +166,13 @@
env.SConscriptChdir(0)
+# Remove major kernel version from linux platform.
+# After Linus switched kernel to new version model this major version
+# shouldn't take much sense for building rules.
+
+if re.match('linux[0-9]+', platform):
+ platform = 'linux'
+
crossbuild = B.arguments.get('BF_CROSS', None)
if crossbuild and platform not in ('win32-vc', 'win64-vc'):
platform = 'linuxcross'
@@ -253,14 +260,23 @@
if k not in B.arguments:
env[k] = v
-# detect presence of 3D_CONNEXION_CLIENT_LIBRARY for OSX
+# Extended OSX_SDK and 3D_CONNEXION_CLIENT_LIBRARY detection for OSX
if env['OURPLATFORM']=='darwin':
- envi = Environment()
- conf = Configure(envi)
- if not conf.CheckCHeader('ConnexionClientAPI.h'): # CheckCXXHeader if it is c++ !
+ print B.bc.OKGREEN + "Detected Xcode version: -- " + B.bc.ENDC + env['XCODE_CUR_VER'][:9] + " --"
+ print "Available " + env['MACOSX_SDK_CHECK']
+ if not 'Mac OS X 10.5' in env['MACOSX_SDK_CHECK']:
+ print B.bc.OKGREEN + "MacOSX10.5.sdk not available:" + B.bc.ENDC + " using MacOSX10.6.sdk"
+ else:
+ print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
+
+ # for now, Mac builders must download and install the driver framework from 3Dconnexion
+ # necessary header file lives here when installed:
+ # /Library/Frameworks/3DconnexionClient.framework/Versions/Current/Headers/ConnexionClientAPI.h
+ if env['WITH_BF_3DMOUSE'] == 1 and not os.path.exists('/Library/Frameworks/3DconnexionClient.framework'):
print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
env['WITH_BF_3DMOUSE'] = 0
- envi = conf.Finish()
+ else:
+ env.Append(LINKFLAGS=['-weak_framework','3DconnexionClient'])
if env['WITH_BF_OPENMP'] == 1:
@@ -542,7 +558,7 @@
scriptinstall.append(env.Install(dir=dir,source=source))
#-- icons
-if env['OURPLATFORM']=='linux2':
+if env['OURPLATFORM']=='linux':
iconlist = []
icontargetlist = []
@@ -621,7 +637,7 @@
if env['OURPLATFORM']=='darwin':
allinstall = [blenderinstall, plugininstall, textinstall]
-elif env['OURPLATFORM']=='linux2':
+elif env['OURPLATFORM']=='linux':
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall, iconinstall]
else:
allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
Modified: branches/soc-2011-carrot/build_files/buildbot/master.cfg
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/master.cfg 2011-08-21 19:25:56 UTC (rev 39591)
+++ branches/soc-2011-carrot/build_files/buildbot/master.cfg 2011-08-21 19:37:19 UTC (rev 39592)
@@ -116,7 +116,7 @@
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, 'win64_scons', 'windows', generic_builder)
+add_builder(c, 'win64_scons', 'win64', generic_builder)
#add_builder(c, 'freebsd_i386_cmake', '', generic_builder)
#add_builder(c, 'freebsd_x86_64_cmake', '', generic_builder)
Modified: branches/soc-2011-carrot/build_files/buildbot/slave_compile.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/slave_compile.py 2011-08-21 19:25:56 UTC (rev 39591)
+++ branches/soc-2011-carrot/build_files/buildbot/slave_compile.py 2011-08-21 19:37:19 UTC (rev 39592)
@@ -134,7 +134,7 @@
scons_options.append('BF_FFMPEG_LIB=' + (' '.join(ffmpeg_lib)))
scons_options.append('BF_FFMPEG_DLL=' + (' '.join(ffmpeg_dll)))
- scons_options.append('BF_BITNESS='+bitness)
+ scons_options.append('BF_BITNESS=' + bitness)
retcode = subprocess.call(['python', 'scons/scons.py'] + scons_options)
sys.exit(retcode)
Modified: branches/soc-2011-carrot/build_files/buildbot/slave_pack.py
===================================================================
--- branches/soc-2011-carrot/build_files/buildbot/slave_pack.py 2011-08-21 19:25:56 UTC (rev 39591)
+++ branches/soc-2011-carrot/build_files/buildbot/slave_pack.py 2011-08-21 19:37:19 UTC (rev 39592)
@@ -98,7 +98,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list