[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53204] branches/soc-2011-tomato: Merging r52895 through r53202 from trunk into soc-2011-tomato

Sergey Sharybin sergey.vfx at gmail.com
Thu Dec 20 12:46:58 CET 2012


Revision: 53204
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53204
Author:   nazgul
Date:     2012-12-20 11:46:58 +0000 (Thu, 20 Dec 2012)
Log Message:
-----------
Merging r52895 through r53202 from trunk into soc-2011-tomato

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

Modified Paths:
--------------
    branches/soc-2011-tomato/CMakeLists.txt
    branches/soc-2011-tomato/SConstruct
    branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
    branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
    branches/soc-2011-tomato/build_files/scons/config/linux-config.py
    branches/soc-2011-tomato/build_files/scons/tools/btools.py
    branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.cpp
    branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactQuantizedBvh.h
    branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.cpp
    branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btGImpactShape.h
    branches/soc-2011-tomato/extern/libmv/CMakeLists.txt
    branches/soc-2011-tomato/extern/libmv/ChangeLog
    branches/soc-2011-tomato/extern/libmv/bundle.sh
    branches/soc-2011-tomato/extern/libmv/files.txt
    branches/soc-2011-tomato/extern/libmv/libmv/multiview/fundamental.cc
    branches/soc-2011-tomato/extern/libmv/third_party/gflags/README.libmv
    branches/soc-2011-tomato/extern/libmv/third_party/glog/README.libmv
    branches/soc-2011-tomato/intern/SConscript
    branches/soc-2011-tomato/intern/audaspace/SConscript
    branches/soc-2011-tomato/intern/bsp/SConscript
    branches/soc-2011-tomato/intern/container/SConscript
    branches/soc-2011-tomato/intern/cycles/SConscript
    branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/engine.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/properties.py
    branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
    branches/soc-2011-tomato/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/kernel/SConscript
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_ashikhmin_velvet.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_diffuse.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_oren_nayar.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_phong_ramp.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_ward.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_westin.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/emissive.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/volume.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_displace.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_emission.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-tomato/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/CMakeLists.txt
    branches/soc-2011-tomato/intern/cycles/kernel/osl/SConscript
    branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_phong_ramp.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/emissive.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_globals.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/SConscript
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_geometry.osl
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_mapping.osl
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h
    branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_math.h
    branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-tomato/intern/cycles/render/graph.h
    branches/soc-2011-tomato/intern/cycles/render/nodes.h
    branches/soc-2011-tomato/intern/cycles/render/osl.cpp
    branches/soc-2011-tomato/intern/cycles/render/osl.h
    branches/soc-2011-tomato/intern/cycles/render/svm.cpp
    branches/soc-2011-tomato/intern/cycles/util/util_math.h
    branches/soc-2011-tomato/intern/dualcon/SConscript
    branches/soc-2011-tomato/intern/elbeem/SConscript
    branches/soc-2011-tomato/intern/ghost/GHOST_C-api.h
    branches/soc-2011-tomato/intern/ghost/GHOST_ISystem.h
    branches/soc-2011-tomato/intern/ghost/SConscript
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_C-api.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_System.h
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_SystemWin32.cpp
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowCocoa.mm
    branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2011-tomato/intern/guardedalloc/SConscript
    branches/soc-2011-tomato/intern/guardedalloc/intern/mallocn.c
    branches/soc-2011-tomato/intern/iksolver/SConscript
    branches/soc-2011-tomato/intern/itasc/SConscript
    branches/soc-2011-tomato/intern/itasc/kdl/chain.hpp
    branches/soc-2011-tomato/intern/itasc/kdl/tree.hpp
    branches/soc-2011-tomato/intern/locale/SConscript
    branches/soc-2011-tomato/intern/memutil/SConscript
    branches/soc-2011-tomato/intern/mikktspace/SConscript
    branches/soc-2011-tomato/intern/moto/SConscript
    branches/soc-2011-tomato/intern/opencolorio/SConscript
    branches/soc-2011-tomato/intern/opennl/SConscript
    branches/soc-2011-tomato/intern/raskter/SConscript
    branches/soc-2011-tomato/intern/smoke/SConscript
    branches/soc-2011-tomato/intern/string/SConscript
    branches/soc-2011-tomato/intern/tools/credits_svn_gen.py
    branches/soc-2011-tomato/intern/utfconv/SConscript
    branches/soc-2011-tomato/release/darwin/blender.app/Contents/Info.plist
    branches/soc-2011-tomato/release/darwin/blenderplayer.app/Contents/Info.plist
    branches/soc-2011-tomato/release/datafiles/fonts/droidsans.ttf.gz
    branches/soc-2011-tomato/release/datafiles/startup.blend
    branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2011-tomato/release/scripts/modules/bl_i18n_utils/spell_check_utils.py
    branches/soc-2011-tomato/release/scripts/modules/bpy/utils.py
    branches/soc-2011-tomato/release/scripts/modules/rna_xml.py
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/back_to_black.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/blender_24x.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/elsyiun.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/hexagon.xml
    branches/soc-2011-tomato/release/scripts/presets/interface_theme/ubuntu_ambiance.xml
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/node.py
    branches/soc-2011-tomato/release/scripts/startup/bl_operators/wm.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_mesh.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_particle.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-tomato/release/scripts/templates/addon_add_object.py
    branches/soc-2011-tomato/release/scripts/templates/operator_modal_view3d_raycast.py
    branches/soc-2011-tomato/source/SConscript
    branches/soc-2011-tomato/source/blender/SConscript
    branches/soc-2011-tomato/source/blender/avi/SConscript
    branches/soc-2011-tomato/source/blender/blenfont/BLF_api.h
    branches/soc-2011-tomato/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-tomato/source/blender/blenfont/SConscript
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf.c
    branches/soc-2011-tomato/source/blender/blenfont/intern/blf_lang.c
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_context.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_library.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_main.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_modifier.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_object.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_particle.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_property.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_scene.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_tessmesh.h
    branches/soc-2011-tomato/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenkernel/SConscript
    branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/action.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/armature.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/blender.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/brush.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/collision.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/context.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/curve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/customdata.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/gpencil.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/image.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/key.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/lattice.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/library.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/material.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mball.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/mesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/modifier.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/modifiers_bmesh.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/node.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/object.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/property.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/report.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/sequencer.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/speaker.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/world.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/writeffmpeg.c
    branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_listbase.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_path_util.h
    branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/blenlib/SConscript
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_kdopbvh.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/endian_switch.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/fileops.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/freetypefont.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/listbase.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/path_util.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
    branches/soc-2011-tomato/source/blender/blenloader/BLO_readfile.h
    branches/soc-2011-tomato/source/blender/blenloader/SConscript
    branches/soc-2011-tomato/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/writefile.c
    branches/soc-2011-tomato/source/blender/bmesh/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/bmesh/SConscript
    branches/soc-2011-tomato/source/blender/bmesh/bmesh_class.h
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_core.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_marking.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mesh.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_edgesplit.c
    branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2011-tomato/source/blender/collada/SConscript
    branches/soc-2011-tomato/source/blender/collada/collada_internal.cpp
    branches/soc-2011-tomato/source/blender/collada/collada_internal.h
    branches/soc-2011-tomato/source/blender/compositor/SConscript
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_OpenCLKernels.cl
    branches/soc-2011-tomato/source/blender/datatoc/datatoc.c
    branches/soc-2011-tomato/source/blender/editors/SConscript
    branches/soc-2011-tomato/source/blender/editors/animation/SConscript
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_defines.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_channels_edit.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_draw.c
    branches/soc-2011-tomato/source/blender/editors/animation/anim_markers.c
    branches/soc-2011-tomato/source/blender/editors/animation/keyframes_draw.c
    branches/soc-2011-tomato/source/blender/editors/armature/SConscript
    branches/soc-2011-tomato/source/blender/editors/armature/editarmature.c
    branches/soc-2011-tomato/source/blender/editors/curve/SConscript
    branches/soc-2011-tomato/source/blender/editors/datafiles/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/datafiles/SConscript
    branches/soc-2011-tomato/source/blender/editors/gpencil/SConscript
    branches/soc-2011-tomato/source/blender/editors/gpencil/drawgpencil.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_buttons.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_edit.c
    branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2011-tomato/source/blender/editors/include/BIF_gl.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_anim_api.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_datafiles.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_gpencil.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_screen.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_sequencer.h
    branches/soc-2011-tomato/source/blender/editors/include/ED_view3d.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_interface.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_resources.h
    branches/soc-2011-tomato/source/blender/editors/include/UI_view2d.h
    branches/soc-2011-tomato/source/blender/editors/interface/SConscript
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_handlers.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_icons.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_style.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_utils.c
    branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-tomato/source/blender/editors/interface/resources.c
    branches/soc-2011-tomato/source/blender/editors/interface/view2d.c
    branches/soc-2011-tomato/source/blender/editors/io/SConscript
    branches/soc-2011-tomato/source/blender/editors/mask/SConscript
    branches/soc-2011-tomato/source/blender/editors/mask/mask_edit.c
    branches/soc-2011-tomato/source/blender/editors/mask/mask_relationships.c
    branches/soc-2011-tomato/source/blender/editors/mesh/SConscript
    branches/soc-2011-tomato/source/blender/editors/mesh/editface.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_loopcut.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_rip.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_slide.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_utils.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2011-tomato/source/blender/editors/mesh/mesh_ops.c
    branches/soc-2011-tomato/source/blender/editors/mesh/meshtools.c
    branches/soc-2011-tomato/source/blender/editors/metaball/SConscript
    branches/soc-2011-tomato/source/blender/editors/object/SConscript
    branches/soc-2011-tomato/source/blender/editors/object/object_add.c
    branches/soc-2011-tomato/source/blender/editors/object/object_bake.c
    branches/soc-2011-tomato/source/blender/editors/object/object_edit.c
    branches/soc-2011-tomato/source/blender/editors/object/object_transform.c
    branches/soc-2011-tomato/source/blender/editors/object/object_vgroup.c
    branches/soc-2011-tomato/source/blender/editors/physics/SConscript
    branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-tomato/source/blender/editors/physics/physics_fluid.c
    branches/soc-2011-tomato/source/blender/editors/render/SConscript
    branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
    branches/soc-2011-tomato/source/blender/editors/render/render_update.c
    branches/soc-2011-tomato/source/blender/editors/render/render_view.c
    branches/soc-2011-tomato/source/blender/editors/screen/SConscript
    branches/soc-2011-tomato/source/blender/editors/screen/area.c
    branches/soc-2011-tomato/source/blender/editors/screen/glutil.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
    branches/soc-2011-tomato/source/blender/editors/screen/screen_intern.h
    branches/soc-2011-tomato/source/blender/editors/screen/screen_ops.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/SConscript
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_hide.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_mask.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_vertex.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2011-tomato/source/blender/editors/sculpt_paint/sculpt_intern.h
    branches/soc-2011-tomato/source/blender/editors/sound/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_action/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_api/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_buttons/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_console/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_console/console_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_console/console_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
    branches/soc-2011-tomato/source/blender/editors/space_file/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_file/fsmenu.c
    branches/soc-2011-tomato/source/blender/editors/space_file/space_file.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_image/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_image/image_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_image/image_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_image/space_image.c
    branches/soc-2011-tomato/source/blender/editors/space_info/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_info/info_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_info/info_report.c
    branches/soc-2011-tomato/source/blender/editors/space_info/space_info.c
    branches/soc-2011-tomato/source/blender/editors/space_info/textview.c
    branches/soc-2011-tomato/source/blender/editors/space_info/textview.h
    branches/soc-2011-tomato/source/blender/editors/space_logic/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_logic/logic_window.c
    branches/soc-2011-tomato/source/blender/editors/space_nla/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_nla/nla_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_node/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_add.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_node/node_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_script/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_sequencer/space_sequencer.c
    branches/soc-2011-tomato/source/blender/editors/space_text/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/editors/space_text/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_text/space_text.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_header.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_text/text_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_python.c
    branches/soc-2011-tomato/source/blender/editors/space_time/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_userpref/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_view3d/SConscript
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/drawvolume.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/space_view3d.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_buttons.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_fly.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_iterators.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2011-tomato/source/blender/editors/transform/SConscript
    branches/soc-2011-tomato/source/blender/editors/transform/transform.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_input.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_manipulator.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-tomato/source/blender/editors/util/SConscript
    branches/soc-2011-tomato/source/blender/editors/uvedit/SConscript
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_draw.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_intern.h
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-tomato/source/blender/gpu/SConscript
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_buffers.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-tomato/source/blender/ikplugin/SConscript
    branches/soc-2011-tomato/source/blender/imbuf/SConscript
    branches/soc-2011-tomato/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/SConscript
    branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineonlib.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/dpxlib.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/dds/SConscript
    branches/soc-2011-tomato/source/blender/imbuf/intern/openexr/SConscript
    branches/soc-2011-tomato/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_screen_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_userdef_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
    branches/soc-2011-tomato/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2011-tomato/source/blender/makesdna/SConscript
    branches/soc-2011-tomato/source/blender/makesdna/intern/SConscript
    branches/soc-2011-tomato/source/blender/makesdna/intern/makesdna.c
    branches/soc-2011-tomato/source/blender/makesrna/RNA_access.h
    branches/soc-2011-tomato/source/blender/makesrna/RNA_types.h
    branches/soc-2011-tomato/source/blender/makesrna/SConscript
    branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
    branches/soc-2011-tomato/source/blender/makesrna/intern/makesrna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_cloth.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_main_api.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_modifier.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_object.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_rna.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_sculpt_paint.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2011-tomato/source/blender/modifiers/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/modifiers/MOD_modifiertypes.h
    branches/soc-2011-tomato/source/blender/modifiers/SConscript
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_decimate.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_edgesplit.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_util.c
    branches/soc-2011-tomato/source/blender/nodes/SConscript
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
    branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
    branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
    branches/soc-2011-tomato/source/blender/opencl/SConscript
    branches/soc-2011-tomato/source/blender/python/SConscript
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_api.c
    branches/soc-2011-tomato/source/blender/python/bmesh/bmesh_py_utils.c
    branches/soc-2011-tomato/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/python/intern/bpy.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-tomato/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2011-tomato/source/blender/quicktime/SConscript
    branches/soc-2011-tomato/source/blender/quicktime/apple/qtkit_export.m
    branches/soc-2011-tomato/source/blender/quicktime/quicktime_export.h
    branches/soc-2011-tomato/source/blender/render/CMakeLists.txt
    branches/soc-2011-tomato/source/blender/render/SConscript
    branches/soc-2011-tomato/source/blender/render/intern/include/rayobject.h
    branches/soc-2011-tomato/source/blender/render/intern/include/render_types.h
    branches/soc-2011-tomato/source/blender/render/intern/include/rendercore.h
    branches/soc-2011-tomato/source/blender/render/intern/raytrace/rayobject.cpp
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pipeline.c
    branches/soc-2011-tomato/source/blender/render/intern/source/pointdensity.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rayshade.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-tomato/source/blender/windowmanager/SConscript
    branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_draw.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_init_exit.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_subwindow.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2011-tomato/source/blender/windowmanager/wm_event_system.h
    branches/soc-2011-tomato/source/blender/windowmanager/wm_event_types.h
    branches/soc-2011-tomato/source/blender/windowmanager/wm_files.h
    branches/soc-2011-tomato/source/blender/windowmanager/wm_window.h
    branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/SConscript
    branches/soc-2011-tomato/source/creator/creator.c
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2011-tomato/source/gameengine/BlenderRoutines/SConscript
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.h
    branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/KX_BlenderSceneConverter.h
    branches/soc-2011-tomato/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2011-tomato/source/gameengine/Converter/SConscript
    branches/soc-2011-tomato/source/gameengine/Expressions/SConscript
    branches/soc-2011-tomato/source/gameengine/GameLogic/SConscript
    branches/soc-2011-tomato/source/gameengine/GamePlayer/SConscript
    branches/soc-2011-tomato/source/gameengine/GamePlayer/common/SConscript
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    branches/soc-2011-tomato/source/gameengine/GamePlayer/ghost/SConscript
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Material.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Texture.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KXNetwork/SConscript
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_BlenderMaterial.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_ISceneConverter.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_KetsjiEngine.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MeshProxy.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_PolygonMaterial.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VertexProxy.cpp
    branches/soc-2011-tomato/source/gameengine/Ketsji/KX_VertexProxy.h
    branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
    branches/soc-2011-tomato/source/gameengine/Network/LoopBackNetwork/SConscript
    branches/soc-2011-tomato/source/gameengine/Network/SConscript
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/CcdPhysicsController.cpp
    branches/soc-2011-tomato/source/gameengine/Physics/Bullet/SConscript
    branches/soc-2011-tomato/source/gameengine/Physics/Dummy/SConscript
    branches/soc-2011-tomato/source/gameengine/Physics/common/SConscript
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_BucketManager.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_IRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MaterialBucket.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MeshObject.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_MeshObject.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_TexVert.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_TexVert.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_texmatrix.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/SConscript
    branches/soc-2011-tomato/source/gameengine/SConscript
    branches/soc-2011-tomato/source/gameengine/SceneGraph/SConscript
    branches/soc-2011-tomato/source/gameengine/VideoTexture/SConscript
    branches/soc-2011-tomato/source/icons/SConscript
    branches/soc-2011-tomato/source/tests/bl_load_addons.py
    branches/soc-2011-tomato/source/tools/check_style_c.py

Added Paths:
-----------
    branches/soc-2011-tomato/extern/bullet2/src/BulletCollision/Gimpact/btCompoundFromGimpact.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_toon.h
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_util.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_toon.cpp
    branches/soc-2011-tomato/release/datafiles/blender_icons.sh
    branches/soc-2011-tomato/release/datafiles/blender_icons.svg
    branches/soc-2011-tomato/release/datafiles/blender_icons16.png
    branches/soc-2011-tomato/release/datafiles/blender_icons32.png
    branches/soc-2011-tomato/release/datafiles/prvicons.sh
    branches/soc-2011-tomato/release/datafiles/prvicons.svg
    branches/soc-2011-tomato/release/scripts/modules/bpy_restrict_state.py
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_bpath.h
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_pbvh.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/bpath.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pbvh.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_edgesplit.c
    branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_edgesplit.h
    branches/soc-2011-tomato/source/blender/editors/space_node/node_toolbar.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format.c
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format.h
    branches/soc-2011-tomato/source/blender/editors/space_text/text_format_py.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvwarp.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_build_options.c
    branches/soc-2011-tomato/source/blender/python/intern/bpy_app_build_options.h
    branches/soc-2011-tomato/source/blender/render/extern/include/RE_multires_bake.h
    branches/soc-2011-tomato/source/blender/render/intern/source/multires_bake.c
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_IStorage.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.h
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.h

Removed Paths:
-------------
    branches/soc-2011-tomato/intern/boolop/
    branches/soc-2011-tomato/intern/cycles/blender/addon/enums.py
    branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_bsdf.h
    branches/soc-2011-tomato/release/datafiles/blender_icons.png
    branches/soc-2011-tomato/source/blender/blenlib/BLI_bpath.h
    branches/soc-2011-tomato/source/blender/blenlib/BLI_pbvh.h
    branches/soc-2011-tomato/source/blender/blenlib/intern/bpath.c
    branches/soc-2011-tomato/source/blender/blenlib/intern/pbvh.c
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.cpp
    branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_diffuse_ramp.h
    branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_diffuse_ramp.cpp
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_rgb_curves.osl
    branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_vector_curves.osl
    branches/soc-2011-tomato/release/datafiles/splash_template.xcf
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-52894
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-53202

Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt	2012-12-20 11:14:52 UTC (rev 53203)
+++ branches/soc-2011-tomato/CMakeLists.txt	2012-12-20 11:46:58 UTC (rev 53204)
@@ -644,20 +644,15 @@
 	if(WITH_BOOST)
 		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			# XXX No more lib dir, is this multithread stuff still needed?
 			if(${WITH_STATIC_LIBS})
 				set(Boost_USE_STATIC_LIBS ON)
 			endif()
-			if(NOT BOOST_ROOT)
-				set(Boost_USE_MULTITHREADED OFF)
-			else()
-				set(Boost_USE_MULTITHREADED ON)
-			endif()
+			set(Boost_USE_MULTITHREADED ON)
 			set(__boost_packages filesystem regex system thread date_time)
 			if (WITH_INTERNATIONAL)
 				list(APPEND __boost_packages locale)
 			endif()
-			find_package(Boost 1.34 COMPONENTS ${__boost_packages})
+			find_package(Boost 1.48 COMPONENTS ${__boost_packages})
 			if(Boost_USE_STATIC_LIBS AND Boost_USE_ICU)
 				find_package(IcuLinux)
 			endif()
@@ -1521,7 +1516,8 @@
 			endif()
 
 			if(WITH_INPUT_NDOF)
-				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework 3DconnexionClient")
+				set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework 3DconnexionClient")
+				set(NDOF_INCLUDE_DIRS /Library/Frameworks/3DconnexionClient.framework/Headers )
 			endif()
 		endif()
 

Modified: branches/soc-2011-tomato/SConstruct
===================================================================
--- branches/soc-2011-tomato/SConstruct	2012-12-20 11:14:52 UTC (rev 53203)
+++ branches/soc-2011-tomato/SConstruct	2012-12-20 11:46:58 UTC (rev 53204)
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
 # The Original Code is Copyright (C) 2006, Blender Foundation
 # All rights reserved.
@@ -294,7 +294,8 @@
             print "3D_CONNEXION_CLIENT_LIBRARY not found, disabling WITH_BF_3DMOUSE" # avoid build errors !
             env['WITH_BF_3DMOUSE'] = 0
         else:
-            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+            env.Append(LINKFLAGS=['-F/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','3DconnexionClient'])
+            env['BF_3DMOUSE_INC'] = '/Library/Frameworks/3DconnexionClient.framework/Headers'
 
     # for now, Mac builders must download and install the JackOSX framework 
     # necessary header file lives here when installed:
@@ -304,7 +305,7 @@
             print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
             env['WITH_BF_JACK'] = 0
         else:
-            env.Append(LINKFLAGS=['-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+            env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
 
     if env['WITH_BF_CYCLES_OSL'] == 1:	
         OSX_OSL_LIBPATH = Dir(env.subst(env['BF_OSL_LIBPATH'])).abspath
@@ -531,7 +532,8 @@
 data_to_c_simple("release/datafiles/bmonofont.ttf")
 
 data_to_c_simple("release/datafiles/splash.png")
-data_to_c_simple("release/datafiles/blender_icons.png")
+data_to_c_simple("release/datafiles/blender_icons16.png")
+data_to_c_simple("release/datafiles/blender_icons32.png")
 data_to_c_simple("release/datafiles/prvicons.png")
 
 data_to_c_simple("release/datafiles/brushicons/add.png")

Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh	2012-12-20 11:14:52 UTC (rev 53203)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh	2012-12-20 11:46:58 UTC (rev 53204)
@@ -1588,11 +1588,6 @@
   INFO ""
   install_packages_SUSE $_packages
 
-  OPENJPEG_USE=true
-  SCHRO_USE=true
-  VORBIS_USE=true
-  THEORA_USE=true
-
   INFO ""
   X264_DEV="x264-devel"
   check_package_version_ge_SUSE $X264_DEV $X264_VERSION_MIN
@@ -1792,34 +1787,58 @@
   INFO ""
   INFO "If you're using CMake add this to your configuration flags:"
 
+  _buildargs=""
+
   if $ALL_STATIC; then
-    INFO "  -D WITH_STATIC_LIBS=ON"
+    _1="-D WITH_STATIC_LIBS=ON"
+    INFO "  $_1"
+    _buildargs="$_buildargs $_1"
   fi
 
   if [ -d $INST/boost ]; then
-    INFO "  -D BOOST_ROOT=$INST/boost"
-    INFO "  -D Boost_NO_SYSTEM_PATHS=ON"
+    _1="-D BOOST_ROOT=$INST/boost"
+    _2="-D Boost_NO_SYSTEM_PATHS=ON"
+    INFO "  $_1"
+    INFO "  $_2"
+    _buildargs="$_buildargs $_1 $_2"
   elif $ALL_STATIC; then
-    INFO "  -D Boost_USE_ICU=ON"
+    _1="-D Boost_USE_ICU=ON"
+    INFO "  $_1"
+    _buildargs="$_buildargs $_1"
   fi
 
   if [ -d $INST/osl -a $WITH_OSL == true ]; then
-    INFO "  -D CYCLES_OSL=$INST/osl"
-    INFO "  -D WITH_CYCLES_OSL=ON"
-    INFO "  -D LLVM_VERSION=$LLVM_VERSION_FOUND"
+    _1="-D CYCLES_OSL=$INST/osl"
+    _2="-D WITH_CYCLES_OSL=ON"
+    _3="-D LLVM_VERSION=$LLVM_VERSION_FOUND"
+    INFO "  $_1"
+    INFO "  $_2"
+    INFO "  $_3"
+    _buildargs="$_buildargs $_1 $_2 $_3"
     if [ -d $INST/llvm ]; then
-      INFO "  -D LLVM_DIRECTORY=$INST/llvm"
-      INFO "  -D LLVM_STATIC=ON"
+      _1="-D LLVM_DIRECTORY=$INST/llvm"
+      _2="-D LLVM_STATIC=ON"
+      INFO "  $_1"
+      INFO "  $_2"
+      _buildargs="$_buildargs $_1 $_2"
     fi
   fi
 
   if [ -d $INST/ffmpeg ]; then
-    INFO "  -D WITH_CODEC_FFMPEG=ON"
-    INFO "  -D FFMPEG=$INST/ffmpeg"
-    INFO "  -D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'"
+    _1="-D WITH_CODEC_FFMPEG=ON"
+    _2="-D FFMPEG=$INST/ffmpeg"
+    _3="-D FFMPEG_LIBRARIES='avformat;avcodec;avutil;avdevice;swscale;rt;`print_info_ffmpeglink`'"
+    INFO "  $_1"
+    INFO "  $_2"
+    INFO "  $_3"
+    _buildargs="$_buildargs $_1 $_2 $_3"
   fi
 
   INFO ""
+  INFO "Or even simpler, just run (in your build dir):"
+  INFO "  make -j$THREADS BUILD_CMAKE_ARGS=\"$_buildargs\""
+
+  INFO ""
   INFO "If you're using SCons add this to your user-config:"
 
   if [ -d $INST/python-3.3 ]; then
@@ -1837,6 +1856,7 @@
 
   if [ -d $INST/boost ]; then
     INFO "BF_BOOST = '$INST/boost'"
+    INFO "WITH_BF_BOOST = True"
   fi
 
   if [ -d $INST/ffmpeg ]; then

Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2012-12-20 11:14:52 UTC (rev 53203)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py	2012-12-20 11:46:58 UTC (rev 53204)
@@ -165,7 +165,7 @@
 WITH_BF_JACK = True
 BF_JACK = '/Library/Frameworks/Jackmp.framework'
 BF_JACK_INC = '${BF_JACK}/headers'
-BF_JACK_LIB = 'jack'
+#BF_JACK_LIB = 'jack' # not used due framework
 BF_JACK_LIBPATH = '${BF_JACK}'
 
 WITH_BF_SNDFILE = True

Modified: branches/soc-2011-tomato/build_files/scons/config/linux-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/linux-config.py	2012-12-20 11:14:52 UTC (rev 53203)
+++ branches/soc-2011-tomato/build_files/scons/config/linux-config.py	2012-12-20 11:46:58 UTC (rev 53204)
@@ -1,15 +1,5 @@
-# find library directory
-import platform
-import os
 from Modules.FindPython import FindPython
 
-bitness = platform.architecture()[0]
-if bitness == '64bit':
-    LCGDIR = '../lib/linux64'
-else:
-    LCGDIR = '../lib/linux'
-LIBDIR = "#${LCGDIR}"
-
 py = FindPython()
 
 BF_PYTHON_ABI_FLAGS = py['ABI_FLAGS']
@@ -113,7 +103,7 @@
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/include'
 
 WITH_BF_ICONV = False
-BF_ICONV = LIBDIR + "/iconv"
+BF_ICONV = "/usr"
 BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
@@ -122,18 +112,7 @@
 
 # enable ffmpeg  support
 WITH_BF_FFMPEG = True
-BF_FFMPEG = LIBDIR + '/ffmpeg'
-if os.path.exists(LCGDIR + '/ffmpeg'):
-    WITH_BF_STATICFFMPEG = True
-    BF_FFMPEG_LIB_STATIC = '${BF_FFMPEG_LIBPATH}/libavformat.a ${BF_FFMPEG_LIBPATH}/libswscale.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libavcodec.a ${BF_FFMPEG_LIBPATH}/libavdevice.a ${BF_FFMPEG_LIBPATH}/libavutil.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libxvidcore.a ${BF_FFMPEG_LIBPATH}/libx264.a ${BF_FFMPEG_LIBPATH}/libmp3lame.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libvpx.a ${BF_FFMPEG_LIBPATH}/libvorbis.a ${BF_FFMPEG_LIBPATH}/libogg.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libvorbisenc.a ${BF_FFMPEG_LIBPATH}/libtheora.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libschroedinger-1.0.a ${BF_FFMPEG_LIBPATH}/liborc-0.4.a ${BF_FFMPEG_LIBPATH}/libdirac_encoder.a ' + \
-        '${BF_FFMPEG_LIBPATH}/libfaad.a'
-else:
-    BF_FFMPEG = '/usr'
+BF_FFMPEG = '/usr'
 BF_FFMPEG_LIB = 'avformat avcodec swscale avutil avdevice'
 BF_FFMPEG_INC = '${BF_FFMPEG}/include'
 BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
@@ -198,34 +177,30 @@
 BF_JEMALLOC_LIB = 'jemalloc'
 BF_JEMALLOC_LIB_STATIC = '${BF_JEMALLOC_LIBPATH}/libjemalloc.a'
 
-WITH_BF_OIIO = True
+WITH_BF_OIIO = False
 WITH_BF_STATICOIIO = False
-BF_OIIO = LIBDIR + '/oiio'
-if not os.path.exists(LCGDIR + '/oiio'):
-    WITH_BF_OIIO = False
-    BF_OIIO = '/usr'
+BF_OIIO = '/usr'
 BF_OIIO_INC = '${BF_OIIO}/include'
 BF_OIIO_LIB = 'OpenImageIO'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a ${BF_JPEG}/lib/libjpeg.a'

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list