[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57124] branches/soc-2011-tomato: Merging r56947 through r57121 from trunk into soc-2011-tomato
Sergey Sharybin
sergey.vfx at gmail.com
Wed May 29 19:53:54 CEST 2013
Revision: 57124
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57124
Author: nazgul
Date: 2013-05-29 17:53:54 +0000 (Wed, 29 May 2013)
Log Message:
-----------
Merging r56947 through r57121 from trunk into soc-2011-tomato
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=56947
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57121
Modified Paths:
--------------
branches/soc-2011-tomato/CMakeLists.txt
branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
branches/soc-2011-tomato/build_files/scons/config/win32-vc-config.py
branches/soc-2011-tomato/build_files/scons/config/win64-vc-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/doc/manpage/blender.1.py
branches/soc-2011-tomato/doc/python_api/rst/info_gotcha.rst
branches/soc-2011-tomato/extern/carve/include/carve/win32.h
branches/soc-2011-tomato/intern/container/CTR_TaggedIndex.h
branches/soc-2011-tomato/intern/cycles/blender/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/blender/addon/ui.py
branches/soc-2011-tomato/intern/cycles/blender/blender_shader.cpp
branches/soc-2011-tomato/intern/cycles/device/device_opencl.cpp
branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf.h
branches/soc-2011-tomato/intern/cycles/kernel/closure/bsdf_reflection.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/kernel_bvh.h
branches/soc-2011-tomato/intern/cycles/kernel/kernel_compat_opencl.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/osl_closures.cpp
branches/soc-2011-tomato/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/CMakeLists.txt
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_fresnel.h
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_fresnel.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_glass_bsdf.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_layer_weight.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2011-tomato/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_tex_coord.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_types.h
branches/soc-2011-tomato/intern/cycles/kernel/svm/svm_wireframe.h
branches/soc-2011-tomato/intern/cycles/render/nodes.cpp
branches/soc-2011-tomato/intern/cycles/render/nodes.h
branches/soc-2011-tomato/intern/cycles/util/util_path.cpp
branches/soc-2011-tomato/intern/cycles/util/util_path.h
branches/soc-2011-tomato/intern/ghost/CMakeLists.txt
branches/soc-2011-tomato/intern/ghost/SConscript
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_WindowWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2011-tomato/intern/ghost/test/CMakeLists.txt
branches/soc-2011-tomato/intern/guardedalloc/CMakeLists.txt
branches/soc-2011-tomato/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2011-tomato/intern/guardedalloc/mmap_win.h
branches/soc-2011-tomato/intern/memutil/MEM_Allocator.h
branches/soc-2011-tomato/intern/opennl/superlu/superlu_sys_types.h
branches/soc-2011-tomato/intern/smoke/intern/FLUID_3D.cpp
branches/soc-2011-tomato/release/scripts/modules/addon_utils.py
branches/soc-2011-tomato/release/scripts/modules/bpy_extras/object_utils.py
branches/soc-2011-tomato/release/scripts/modules/console_python.py
branches/soc-2011-tomato/release/scripts/modules/nodeitems_utils.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/3dsmax.py
branches/soc-2011-tomato/release/scripts/presets/keyconfig/maya.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-tomato/release/scripts/startup/bl_operators/console.py
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_particle.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_clip.py
branches/soc-2011-tomato/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-tomato/release/scripts/startup/nodeitems_builtins.py
branches/soc-2011-tomato/source/blender/avi/AVI_avi.h
branches/soc-2011-tomato/source/blender/avi/intern/avi.c
branches/soc-2011-tomato/source/blender/blenfont/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenfont/SConscript
branches/soc-2011-tomato/source/blender/blenkernel/BKE_bmesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_cdderivedmesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_cloth.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_customdata.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_displist.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_global.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_image.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mask.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_node.h
branches/soc-2011-tomato/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2011-tomato/source/blender/blenkernel/intern/CCGSubSurf.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/anim_sys.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/bmfont.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/camera.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/constraint.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/displist.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/icons.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/mask.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/mesh_validate.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/multires.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/nla.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/object_deform.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/rigidbody.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/scene.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/seqcache.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/smoke.c
branches/soc-2011-tomato/source/blender/blenkernel/intern/tracking.c
branches/soc-2011-tomato/source/blender/blenlib/BLI_array.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_ghash.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2011-tomato/source/blender/blenlib/BLI_utildefines.h
branches/soc-2011-tomato/source/blender/blenlib/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenlib/intern/BLI_ghash.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/math_interp.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_matrix.c
branches/soc-2011-tomato/source/blender/blenlib/intern/math_rotation.c
branches/soc-2011-tomato/source/blender/blenlib/intern/winstuff.c
branches/soc-2011-tomato/source/blender/blenloader/CMakeLists.txt
branches/soc-2011-tomato/source/blender/blenloader/intern/readblenentry.c
branches/soc-2011-tomato/source/blender/bmesh/CMakeLists.txt
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_iterators_inline.h
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_mods.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_mods.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2011-tomato/source/blender/bmesh/intern/bmesh_polygon.h
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/intern/bmesh_walkers_impl.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_bridge.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_similar.c
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2011-tomato/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2011-tomato/source/blender/collada/AnimationExporter.cpp
branches/soc-2011-tomato/source/blender/collada/AnimationImporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureExporter.cpp
branches/soc-2011-tomato/source/blender/collada/ArmatureImporter.cpp
branches/soc-2011-tomato/source/blender/collada/CMakeLists.txt
branches/soc-2011-tomato/source/blender/collada/ControllerExporter.cpp
branches/soc-2011-tomato/source/blender/collada/DocumentImporter.cpp
branches/soc-2011-tomato/source/blender/collada/MeshImporter.cpp
branches/soc-2011-tomato/source/blender/collada/SConscript
branches/soc-2011-tomato/source/blender/collada/TransformReader.cpp
branches/soc-2011-tomato/source/blender/collada/TransformWriter.cpp
branches/soc-2011-tomato/source/blender/collada/collada_utils.cpp
branches/soc-2011-tomato/source/blender/compositor/CMakeLists.txt
branches/soc-2011-tomato/source/blender/compositor/SConscript
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BilateralBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_BokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_DirectionalBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_GaussianBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/compositor/operations/COM_VariableSizeBokehBlurOperation.h
branches/soc-2011-tomato/source/blender/editors/animation/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/animation/SConscript
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/anim_ops.c
branches/soc-2011-tomato/source/blender/editors/animation/keyframes_general.c
branches/soc-2011-tomato/source/blender/editors/armature/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/armature/SConscript
branches/soc-2011-tomato/source/blender/editors/armature/armature_relations.c
branches/soc-2011-tomato/source/blender/editors/curve/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/curve/SConscript
branches/soc-2011-tomato/source/blender/editors/curve/editcurve.c
branches/soc-2011-tomato/source/blender/editors/gpencil/CMakeLists.txt
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_ops.c
branches/soc-2011-tomato/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2011-tomato/source/blender/editors/include/ED_image.h
branches/soc-2011-tomato/source/blender/editors/include/ED_mesh.h
branches/soc-2011-tomato/source/blender/editors/include/ED_transform.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/interface/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/interface/SConscript
branches/soc-2011-tomato/source/blender/editors/interface/interface_draw.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_layout.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_templates.c
branches/soc-2011-tomato/source/blender/editors/interface/interface_widgets.c
branches/soc-2011-tomato/source/blender/editors/interface/view2d_ops.c
branches/soc-2011-tomato/source/blender/editors/io/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/io/SConscript
branches/soc-2011-tomato/source/blender/editors/mask/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/mask/SConscript
branches/soc-2011-tomato/source/blender/editors/mesh/CMakeLists.txt
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_extrude.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_select.c
branches/soc-2011-tomato/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-tomato/source/blender/editors/mesh/mesh_intern.h
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/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/metaball/SConscript
branches/soc-2011-tomato/source/blender/editors/object/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/object/SConscript
branches/soc-2011-tomato/source/blender/editors/object/object_constraint.c
branches/soc-2011-tomato/source/blender/editors/object/object_hook.c
branches/soc-2011-tomato/source/blender/editors/object/object_shapekey.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/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/physics/SConscript
branches/soc-2011-tomato/source/blender/editors/render/render_internal.c
branches/soc-2011-tomato/source/blender/editors/render/render_opengl.c
branches/soc-2011-tomato/source/blender/editors/screen/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/screen/SConscript
branches/soc-2011-tomato/source/blender/editors/screen/screen_edit.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/SConscript
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_2d.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_mask.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_ops.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-tomato/source/blender/editors/sculpt_paint/paint_utils.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/sound/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/sound/SConscript
branches/soc-2011-tomato/source/blender/editors/space_action/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_action/SConscript
branches/soc-2011-tomato/source/blender/editors/space_api/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_api/SConscript
branches/soc-2011-tomato/source/blender/editors/space_buttons/CMakeLists.txt
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/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_clip/SConscript
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/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_console/SConscript
branches/soc-2011-tomato/source/blender/editors/space_console/space_console.c
branches/soc-2011-tomato/source/blender/editors/space_graph/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_graph/SConscript
branches/soc-2011-tomato/source/blender/editors/space_image/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_image/SConscript
branches/soc-2011-tomato/source/blender/editors/space_image/image_draw.c
branches/soc-2011-tomato/source/blender/editors/space_image/image_edit.c
branches/soc-2011-tomato/source/blender/editors/space_logic/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_logic/SConscript
branches/soc-2011-tomato/source/blender/editors/space_nla/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_nla/SConscript
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_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_templates.c
branches/soc-2011-tomato/source/blender/editors/space_node/space_node.c
branches/soc-2011-tomato/source/blender/editors/space_outliner/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_outliner/SConscript
branches/soc-2011-tomato/source/blender/editors/space_script/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_script/SConscript
branches/soc-2011-tomato/source/blender/editors/space_sequencer/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_sequencer/SConscript
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_time/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_time/SConscript
branches/soc-2011-tomato/source/blender/editors/space_userpref/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_userpref/SConscript
branches/soc-2011-tomato/source/blender/editors/space_view3d/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/space_view3d/SConscript
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/drawobject.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_header.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2011-tomato/source/blender/editors/space_view3d/view3d_select.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/CMakeLists.txt
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.h
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_manipulator.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_ops.c
branches/soc-2011-tomato/source/blender/editors/transform/transform_orientations.c
branches/soc-2011-tomato/source/blender/editors/util/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/util/SConscript
branches/soc-2011-tomato/source/blender/editors/uvedit/CMakeLists.txt
branches/soc-2011-tomato/source/blender/editors/uvedit/SConscript
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-tomato/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-tomato/source/blender/freestyle/CMakeLists.txt
branches/soc-2011-tomato/source/blender/freestyle/SConscript
branches/soc-2011-tomato/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/python/Interface1D/BPy_Stroke.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/stroke/Stroke.cpp
branches/soc-2011-tomato/source/blender/freestyle/intern/stroke/Stroke.h
branches/soc-2011-tomato/source/blender/freestyle/intern/system/PseudoNoise.cpp
branches/soc-2011-tomato/source/blender/gpu/CMakeLists.txt
branches/soc-2011-tomato/source/blender/gpu/SConscript
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2011-tomato/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-tomato/source/blender/gpu/shaders/gpu_shader_material.glsl
branches/soc-2011-tomato/source/blender/ikplugin/intern/iksolver_plugin.c
branches/soc-2011-tomato/source/blender/ikplugin/intern/itasc_plugin.cpp
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/CMakeLists.txt
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/SConscript
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/cineon_dpx.c
branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageCore.h
branches/soc-2011-tomato/source/blender/imbuf/intern/colormanagement.c
branches/soc-2011-tomato/source/blender/imbuf/intern/dds/FlipDXT.h
branches/soc-2011-tomato/source/blender/imbuf/intern/png.c
branches/soc-2011-tomato/source/blender/imbuf/intern/rectop.c
branches/soc-2011-tomato/source/blender/imbuf/intern/scaling.c
branches/soc-2011-tomato/source/blender/makesdna/DNA_anim_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_defs.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_image_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_lamp_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_material_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_nla_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_node_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_particle_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_property_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_text_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_view3d_types.h
branches/soc-2011-tomato/source/blender/makesdna/DNA_world_types.h
branches/soc-2011-tomato/source/blender/makesdna/intern/CMakeLists.txt
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_types.h
branches/soc-2011-tomato/source/blender/makesrna/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2011-tomato/source/blender/makesrna/intern/SConscript
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mask.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_mesh_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_meta_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_nodetree.c
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_pose_api.c
branches/soc-2011-tomato/source/blender/makesrna/intern/rna_space.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/SConscript
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_array.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_cast.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_hook.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache_mdd.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshcache_pc2.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_meshdeform.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_screw.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_solidify.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_uvwarp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_wave.c
branches/soc-2011-tomato/source/blender/nodes/CMakeLists.txt
branches/soc-2011-tomato/source/blender/nodes/NOD_shader.h
branches/soc-2011-tomato/source/blender/nodes/NOD_static_types.h
branches/soc-2011-tomato/source/blender/nodes/SConscript
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_tree.c
branches/soc-2011-tomato/source/blender/nodes/composite/node_composite_util.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_alphaOver.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bilateralblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_blur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_bokehimage.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_boxmask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_brightness.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_channelMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_chromaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorbalance.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_common.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_composite.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_crop.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_curves.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_defocus.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_despeckle.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_dilate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_directionalblur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_displace.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_distanceMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_doubleEdgeMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_ellipsemask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_filter.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_flip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_gamma.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_glare.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_huecorrect.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_idMask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_image.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_inpaint.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_invert.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keying.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_keyingscreen.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lensdist.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_levels.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_lummaMatte.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapRange.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapUV.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mapValue.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mask.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_math.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_mixrgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_movieclip.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normal.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_normalize.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_outputFile.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_pixelate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_premulkey.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_rotate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_scale.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombHSVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombRGBA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_sepcombYUVA.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_setalpha.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_splitViewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_switch.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_texture.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_tonemap.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_trackpos.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_transform.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_translate.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_value.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_vecBlur.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_viewer.c
branches/soc-2011-tomato/source/blender/nodes/composite/nodes/node_composite_zcombine.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_common.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_exec.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_socket.c
branches/soc-2011-tomato/source/blender/nodes/intern/node_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2011-tomato/source/blender/nodes/shader/node_shader_util.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_add_shader.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_ambient_occlusion.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_attribute.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_background.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_brightness.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_refraction.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bump.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_common.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_emission.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_fresnel.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_gamma.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_geometry.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hair_info.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_holdout.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_light_falloff.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_normal_map.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_object_info.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output_material.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_output_world.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_particle_info.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_script.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tangent.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_brick.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_checker.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_image.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_value.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_wireframe.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2011-tomato/source/blender/nodes/texture/node_texture_util.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_bricks.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_checker.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_common.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_compose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_coord.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_curves.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_decompose.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_distance.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_image.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_invert.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_math.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_mixRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_proc.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_rotate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_scale.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_texture.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_translate.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToNor.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_valToRgb.c
branches/soc-2011-tomato/source/blender/nodes/texture/nodes/node_texture_viewer.c
branches/soc-2011-tomato/source/blender/python/generic/CMakeLists.txt
branches/soc-2011-tomato/source/blender/quicktime/CMakeLists.txt
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/apple/qtkit_import.m
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2011-tomato/source/blender/quicktime/apple/quicktime_import.c
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/render_types.h
branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
branches/soc-2011-tomato/source/blender/render/intern/source/envmap.c
branches/soc-2011-tomato/source/blender/render/intern/source/imagetexture.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/render_texture.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadbuf.c
branches/soc-2011-tomato/source/blender/render/intern/source/shadeinput.c
branches/soc-2011-tomato/source/blender/render/intern/source/strand.c
branches/soc-2011-tomato/source/blender/render/intern/source/volumetric.c
branches/soc-2011-tomato/source/blender/render/intern/source/zbuf.c
branches/soc-2011-tomato/source/blender/windowmanager/WM_api.h
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_window.c
branches/soc-2011-tomato/source/blender/windowmanager/wm_subwindow.h
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/SConscript
branches/soc-2011-tomato/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2011-tomato/source/creator/creator.c
branches/soc-2011-tomato/source/gameengine/Converter/BL_ArmatureChannel.cpp
branches/soc-2011-tomato/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/CMakeLists.txt
branches/soc-2011-tomato/source/gameengine/Expressions/ListValue.cpp
branches/soc-2011-tomato/source/gameengine/Expressions/SConscript
branches/soc-2011-tomato/source/gameengine/Ketsji/BL_Shader.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_GameObject.h
branches/soc-2011-tomato/source/gameengine/Ketsji/KX_MaterialIpoController.cpp
branches/soc-2011-tomato/source/gameengine/Ketsji/SConscript
branches/soc-2011-tomato/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/CMakeLists.txt
branches/soc-2011-tomato/source/tools/uncrustify_clean.sh
Added Paths:
-----------
branches/soc-2011-tomato/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2011-tomato/source/blender/blenlib/BLI_sys_types.h
branches/soc-2011-tomato/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2011-tomato/source/blender/nodes/shader/nodes/node_shader_bsdf_toon.c
Removed Paths:
-------------
branches/soc-2011-tomato/intern/cycles/kernel/osl/bsdf_toon.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SizerWin32.cpp
branches/soc-2011-tomato/intern/ghost/intern/GHOST_SizerWin32.h
branches/soc-2011-tomato/intern/guardedalloc/MEM_sys_types.h
branches/soc-2011-tomato/release/scripts/templates_osl/toon_closure.osl
Property Changed:
----------------
branches/soc-2011-tomato/
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-56946
+ /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-57121
Modified: branches/soc-2011-tomato/CMakeLists.txt
===================================================================
--- branches/soc-2011-tomato/CMakeLists.txt 2013-05-29 17:47:44 UTC (rev 57123)
+++ branches/soc-2011-tomato/CMakeLists.txt 2013-05-29 17:53:54 UTC (rev 57124)
@@ -2234,6 +2234,7 @@
info_cfg_option(WITH_INTERNATIONAL)
info_cfg_option(WITH_INPUT_NDOF)
info_cfg_option(WITH_CYCLES)
+ info_cfg_option(WITH_FREESTYLE)
info_cfg_option(WITH_OPENCOLORIO)
info_cfg_text("Compiler Options:")
Modified: branches/soc-2011-tomato/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-05-29 17:47:44 UTC (rev 57123)
+++ branches/soc-2011-tomato/build_files/build_environment/install_deps.sh 2013-05-29 17:53:54 UTC (rev 57124)
@@ -19,11 +19,13 @@
# A shell script installing/building all needed dependencies to build Blender, for some Linux distributions.
+##### Args and Help Handling #####
+
# Parse command line!
ARGS=$( \
getopt \
-o s:i:t:h \
---long source:,install:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
+--long source:,install:,tmp:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
force-python,force-numpy,force-boost,force-ocio,force-oiio,force-llvm,force-osl,force-opencollada,\
force-ffmpeg,skip-python,skip-numpy,skip-boost,skip-ocio,skip-oiio,skip-llvm,skip-osl,skip-ffmpeg,\
skip-opencollada \
@@ -34,6 +36,7 @@
RPM=""
SRC="$HOME/src/blender-deps"
INST="/opt/lib"
+TMP="/tmp"
CWD=$PWD
# Do not install some optional, potentially conflicting libs by default...
@@ -79,6 +82,9 @@
-i <path>, --install=<path>
Use a specific path where to install built libraries (defaults to '\$INST').
+ --tmp=<path>
+ Use a specific temp path (defaults to '\$TMP').
+
-t n, --threads=n
Use a specific number of threads when building the libraries (auto-detected as '\$THREADS').
@@ -113,6 +119,9 @@
--force-ocio
Force the rebuild of OpenColorIO.
+ --force-openexr
+ Force the rebuild of OpenEXR.
+
--force-oiio
Force the rebuild of OpenImageIO.
@@ -147,6 +156,9 @@
--skip-ocio
Unconditionally skip OpenColorIO installation/building.
+ --skip-openexr
+ Unconditionally skip OpenEXR installation/building.
+
--skip-oiio
Unconditionally skip OpenImageIO installation/building.
@@ -162,6 +174,8 @@
--skip-ffmpeg
Unconditionally skip FFMpeg installation/building.\""
+##### Main Vars #####
+
PYTHON_VERSION="3.3.0"
PYTHON_VERSION_MIN="3.3"
PYTHON_SOURCE="http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.bz2"
@@ -180,6 +194,7 @@
BOOST_VERSION_MIN="1.49"
BOOST_FORCE_REBUILD=false
BOOST_SKIP=false
+_need_boost_ldconfig=false
OCIO_VERSION="1.0.7"
OCIO_SOURCE="https://github.com/imageworks/OpenColorIO/tarball/v$OCIO_VERSION"
@@ -187,11 +202,21 @@
OCIO_FORCE_REBUILD=false
OCIO_SKIP=false
-OIIO_VERSION="1.1.7"
-OIIO_SOURCE="https://github.com/OpenImageIO/oiio/tarball/Release-$OIIO_VERSION"
+OPENEXR_VERSION="2.0.0"
+OPENEXR_SOURCE="http://download.savannah.nongnu.org/releases/openexr/openexr-$OPENEXR_VERSION.tar.gz"
+OPENEXR_VERSION_MIN="2.0"
+ILMBASE_VERSION="2.0.0"
+ILMBASE_SOURCE="http://download.savannah.nongnu.org/releases/openexr/ilmbase-$ILMBASE_VERSION.tar.gz"
+OPENEXR_FORCE_REBUILD=false
+OPENEXR_SKIP=false
+_with_built_openexr=false
+
+OIIO_VERSION="1.1.10"
+OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
OIIO_VERSION_MIN="1.1"
OIIO_FORCE_REBUILD=false
OIIO_SKIP=false
+_need_oiio_ldconfig=false
LLVM_VERSION="3.1"
LLVM_VERSION_MIN="3.0"
@@ -203,7 +228,7 @@
# OSL needs to be compiled for now!
OSL_VERSION="1.3.0"
-OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-1.3.0.tar.gz"
+OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -243,6 +268,7 @@
LANG=""
export LANG
+##### Generic Helpers #####
_echo() {
if [ "X$1" = "X-n" ]; then
@@ -260,6 +286,8 @@
_echo "$@"
}
+##### Args Handling #####
+
# Finish parsing the commandline args.
eval set -- "$ARGS"
while true; do
@@ -270,6 +298,9 @@
-i|--install)
INST="$2"; shift; shift; continue
;;
+ --tmp)
+ TMP="$2"; shift; shift; continue
+ ;;
-t|--threads)
THREADS="$2"; shift; shift; continue
;;
@@ -308,7 +339,9 @@
shift; continue
;;
--force-python)
- PYTHON_FORCE_REBUILD=true; shift; continue
+ PYTHON_FORCE_REBUILD=true
+ NUMPY_FORCE_REBUILD=true
+ shift; continue
;;
--force-numpy)
NUMPY_FORCE_REBUILD=true; shift; continue
@@ -319,11 +352,17 @@
--force-ocio)
OCIO_FORCE_REBUILD=true; shift; continue
;;
+ --force-openexr)
+ OPENEXR_FORCE_REBUILD=true; shift; continue
+ ;;
--force-oiio)
- OIIO_FORCE_REBUILD=true; shift; continue
+ OIIO_FORCE_REBUILD=true
+ shift; continue
;;
--force-llvm)
- LLVM_FORCE_REBUILD=true; shift; continue
+ LLVM_FORCE_REBUILD=true
+ OSL_FORCE_REBUILD=true
+ shift; continue
;;
--force-osl)
OSL_FORCE_REBUILD=true; shift; continue
@@ -346,6 +385,9 @@
--skip-ocio)
OCIO_SKIP=true; shift; continue
;;
+ --skip-openexr)
+ OPENEXR_SKIP=true; shift; continue
+ ;;
--skip-oiio)
OIIO_SKIP=true; shift; continue
;;
@@ -381,6 +423,8 @@
WITH_OPENCOLLADA=true
fi
+##### Generic Helpers #####
+
# Return 0 if $1 = $2 (i.e. 1.01.0 = 1.1, but 1.1.1 != 1.1), else 1.
# $1 and $2 should be version numbers made of numbers only.
version_eq() {
@@ -465,28 +509,7 @@
return $ret
}
-detect_distro() {
- if [ -f /etc/debian_version ]; then
- DISTRO="DEB"
- elif [ -f /etc/arch-release ]; then
- DISTRO="ARCH"
- elif [ -f /etc/redhat-release -o /etc/SuSE-release ]; then
- DISTRO="RPM"
- fi
-}
-
-rpm_flavour() {
- if [ -f /etc/redhat-release ]; then
- if [ "`grep '6\.' /etc/redhat-release`" ]; then
- RPM="RHEL"
- else
- RPM="FEDORA"
- fi
- elif [ -f /etc/SuSE-release ]; then
- RPM="SUSE"
- fi
-}
-
+##### Generic compile helpers #####
prepare_opt() {
INFO "Ensuring $INST exists and is writable by us"
if [ ! -d $INST ]; then
@@ -513,17 +536,41 @@
touch $INST/.$1-magiccheck-$2
}
+# Note: should clean nicely in $INST, but not in $SRC, when we switch to a new version of a lib...
+_clean() {
+ rm -rf `readlink -f $_inst_shortcut`
+ rm -rf $_src
+ rm -rf $_inst
+ rm -rf $_inst_shortcut
+}
+
+_create_inst_shortcut() {
+ rm -f $_inst_shortcut
+ ln -s $_inst $_inst_shortcut
+}
+
+#### Build Python ####
+_init_python() {
+ _src=$SRC/Python-$PYTHON_VERSION
+ _inst=$INST/python-$PYTHON_VERSION
+ _inst_shortcut=$INST/python-3.3
+}
+
+clean_Python() {
+ clean_Numpy
+ _init_python
+ _clean
+}
+
compile_Python() {
# To be changed each time we make edits that would modify the compiled result!
py_magic=0
+ _init_python
- _src=$SRC/Python-$PYTHON_VERSION
- _inst=$INST/python-$PYTHON_VERSION
-
# Clean install if needed!
magic_compile_check python-$PYTHON_VERSION $py_magic
if [ $? -eq 1 -o $PYTHON_FORCE_REBUILD == true ]; then
- rm -rf $_inst
+ clean_Python
fi
if [ ! -d $_inst ]; then
@@ -549,8 +596,7 @@
make clean
if [ -d $_inst ]; then
- rm -f $INST/python-3.3
- ln -s python-$PYTHON_VERSION $INST/python-3.3
+ _create_inst_shortcut
else
ERROR "Python--$PYTHON_VERSION failed to compile, exiting"
exit 1
@@ -566,19 +612,29 @@
fi
}
-compile_Numpy() {
- # To be changed each time we make edits that would modify the compiled result!
- py_magic=0
-
+##### Build Numpy #####
+_init_numpy() {
_src=$SRC/numpy-$NUMPY_VERSION
_inst=$INST/numpy-$NUMPY_VERSION
_python=$INST/python-$PYTHON_VERSION
_site=lib/python3.3/site-packages
+ _inst_shortcut=$_python/$_site/numpy
+}
+clean_Numpy() {
+ _init_numpy
+ _clean
+}
+
+compile_Numpy() {
+ # To be changed each time we make edits that would modify the compiled result!
+ py_magic=0
+ _init_numpy
+
# Clean install if needed!
magic_compile_check numpy-$NUMPY_VERSION $py_magic
if [ $? -eq 1 -o $NUMPY_FORCE_REBUILD == true ]; then
- rm -rf $_inst
+ clean_Numpy
fi
if [ ! -d $_inst ]; then
@@ -599,8 +655,9 @@
$_python/bin/python3 setup.py install --prefix=$_inst
if [ -d $_inst ]; then
- rm -f $_python/$_site/numpy
- ln -s $_inst/$_site/numpy $_python/$_site/numpy
+ # Can't use _create_inst_shortcut here...
+ rm -f $_inst_shortcut
+ ln -s $_inst/$_site/numpy $_inst_shortcut
else
ERROR "Numpy-$NUMPY_VERSION failed to compile, exiting"
exit 1
@@ -616,22 +673,37 @@
fi
}
+#### Build Boost ####
+_init_boost() {
+ _src=$SRC/boost-$BOOST_VERSION
+ _inst=$INST/boost-$BOOST_VERSION
+ _inst_shortcut=$INST/boost
+}
+
+clean_Boost() {
+ _init_boost
+ _clean
+}
+
compile_Boost() {
# To be changed each time we make edits that would modify the compiled result!
boost_magic=7
- _src=$SRC/boost-$BOOST_VERSION
- _inst=$INST/boost-$BOOST_VERSION
+ _init_boost
# Clean install if needed!
magic_compile_check boost-$BOOST_VERSION $boost_magic
if [ $? -eq 1 -o $BOOST_FORCE_REBUILD == true ]; then
- rm -rf $_inst
+ clean_Boost
fi
if [ ! -d $_inst ]; then
INFO "Building Boost-$BOOST_VERSION"
+ # Rebuild dependecies as well!
+ OIIO_FORCE_REBUILD=true
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list