[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60202] branches/soc-2013-cycles_volume: - merge from trunk, up to r60196;

Rafael Campos rafaelcdn at gmail.com
Tue Sep 17 16:49:12 CEST 2013


Revision: 60202
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60202
Author:   jehuty
Date:     2013-09-17 14:49:11 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
- merge from trunk, up to r60196;
note: this fixed the problem with RNA I was getting when loading a osl shader;

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

Modified Paths:
--------------
    branches/soc-2013-cycles_volume/CMakeLists.txt
    branches/soc-2013-cycles_volume/SConstruct
    branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh
    branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake
    branches/soc-2013-cycles_volume/build_files/scons/config/darwin-config.py
    branches/soc-2013-cycles_volume/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
    branches/soc-2013-cycles_volume/extern/libmv/libmv/simple_pipeline/keyframe_selection.cc
    branches/soc-2013-cycles_volume/extern/libmv/libmv/simple_pipeline/keyframe_selection.h
    branches/soc-2013-cycles_volume/extern/libmv/libmv/simple_pipeline/pipeline.cc
    branches/soc-2013-cycles_volume/extern/libmv/libmv-capi.cc
    branches/soc-2013-cycles_volume/extern/libmv/libmv-capi_stub.cc
    branches/soc-2013-cycles_volume/intern/cycles/blender/addon/__init__.py
    branches/soc-2013-cycles_volume/intern/cycles/blender/addon/ui.py
    branches/soc-2013-cycles_volume/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-cycles_volume/intern/cycles/blender/blender_python.cpp
    branches/soc-2013-cycles_volume/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-cycles_volume/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-cycles_volume/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2013-cycles_volume/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2013-cycles_volume/intern/cycles/kernel/closure/bsdf.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_film.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/CMakeLists.txt
    branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/stdosl.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2013-cycles_volume/intern/cycles/render/attribute.cpp
    branches/soc-2013-cycles_volume/intern/cycles/render/film.cpp
    branches/soc-2013-cycles_volume/intern/cycles/render/nodes.cpp
    branches/soc-2013-cycles_volume/intern/cycles/render/nodes.h
    branches/soc-2013-cycles_volume/intern/cycles/render/scene.cpp
    branches/soc-2013-cycles_volume/intern/cycles/render/shader.cpp
    branches/soc-2013-cycles_volume/intern/ghost/CMakeLists.txt
    branches/soc-2013-cycles_volume/intern/ghost/SConscript
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_NDOFManager.h
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_NDOFManagerCocoa.h
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_NDOFManagerCocoa.mm
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemCocoa.mm
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemX11.cpp
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowWin32.cpp
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowX11.cpp
    branches/soc-2013-cycles_volume/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2013-cycles_volume/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2013-cycles_volume/intern/mikktspace/mikktspace.c
    branches/soc-2013-cycles_volume/intern/opencolorio/fallback_impl.cc
    branches/soc-2013-cycles_volume/intern/opencolorio/ocio_capi.cc
    branches/soc-2013-cycles_volume/intern/opencolorio/ocio_capi.h
    branches/soc-2013-cycles_volume/intern/opencolorio/ocio_impl.cc
    branches/soc-2013-cycles_volume/intern/opencolorio/ocio_impl.h
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/config.ocio
    branches/soc-2013-cycles_volume/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
    branches/soc-2013-cycles_volume/release/scripts/modules/bpy_extras/object_utils.py
    branches/soc-2013-cycles_volume/release/scripts/presets/keyconfig/3dsmax.py
    branches/soc-2013-cycles_volume/release/scripts/presets/keyconfig/maya.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/uvcalc_lightmap.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_constraint.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_info.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2013-cycles_volume/release/scripts/startup/nodeitems_builtins.py
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_action.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_addon.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_blender.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_ccg.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_curve.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_customdata.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_editmesh.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mask.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mesh.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_navmesh_conversion.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_node.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_object.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_ocean.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_paint.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_shrinkwrap.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/action.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/addon.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/anim_sys.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/blender.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/colortools.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/constraint.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/curve.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/customdata.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/editmesh_bvh.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/freestyle.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/image.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/linestyle.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mask.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mesh.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mesh_validate.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/multires.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/navmesh_conversion.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/node.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/object.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/ocean.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh_intern.h
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/scene.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/shrinkwrap.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/tracking.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_array.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_bitmap.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_boxpack2d.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_buffer.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_callbacks.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_linklist_stack.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_interp.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_matrix.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_rotation.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_array.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/boxpack2d.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/buffer.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/callbacks.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_geom.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_interp.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_matrix.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_rotation.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-cycles_volume/source/blender/blenloader/BLO_readfile.h
    branches/soc-2013-cycles_volume/source/blender/blenloader/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-cycles_volume/source/blender/blenloader/intern/versioning_legacy.c
    branches/soc-2013-cycles_volume/source/blender/blenloader/intern/writefile.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/bmesh.h
    branches/soc-2013-cycles_volume/source/blender/bmesh/bmesh_class.h
    branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_log.h
    branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_fill_grid.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_normals.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_poke.c
    branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_wireframe.c
    branches/soc-2013-cycles_volume/source/blender/compositor/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionGroup.cpp
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionGroup.h
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionSystem.cpp
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionSystemHelper.h
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_NodeBase.h
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_NodeOperation.h
    branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_RenderLayersProg.cpp
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_RenderLayersProg.h
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SetColorOperation.h
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SetValueOperation.h
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SetVectorOperation.h
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_TrackPositionOperation.h
    branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
    branches/soc-2013-cycles_volume/source/blender/datatoc/datatoc.c
    branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_ipo_utils.c
    branches/soc-2013-cycles_volume/source/blender/editors/animation/keyframing.c
    branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_utils.c
    branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_slide.c
    branches/soc-2013-cycles_volume/source/blender/editors/curve/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/blender/editors/curve/curve_intern.h
    branches/soc-2013-cycles_volume/source/blender/editors/curve/editcurve.c
    branches/soc-2013-cycles_volume/source/blender/editors/curve/lorem.c
    branches/soc-2013-cycles_volume/source/blender/editors/gpencil/gpencil_paint.c
    branches/soc-2013-cycles_volume/source/blender/editors/include/ED_armature.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/ED_mball.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/ED_mesh.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/ED_object.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/ED_util.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/ED_view3d.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/UI_interface.h
    branches/soc-2013-cycles_volume/source/blender/editors/include/UI_view2d.h
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_anim.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_handlers.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_intern.h
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_regions.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_templates.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_widgets.c
    branches/soc-2013-cycles_volume/source/blender/editors/interface/view2d_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/editface.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_add.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_bisect.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_extrude.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_tools.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_navmesh.c
    branches/soc-2013-cycles_volume/source/blender/editors/mesh/meshtools.c
    branches/soc-2013-cycles_volume/source/blender/editors/metaball/mball_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/object/object_add.c
    branches/soc-2013-cycles_volume/source/blender/editors/object/object_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/object/object_transform.c
    branches/soc-2013-cycles_volume/source/blender/editors/object/object_vgroup.c
    branches/soc-2013-cycles_volume/source/blender/editors/physics/dynamicpaint_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/physics/physics_pointcache.c
    branches/soc-2013-cycles_volume/source/blender/editors/render/render_internal.c
    branches/soc-2013-cycles_volume/source/blender/editors/render/render_opengl.c
    branches/soc-2013-cycles_volume/source/blender/editors/screen/area.c
    branches/soc-2013-cycles_volume/source/blender/editors/screen/screen_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_cursor.c
    branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_image_proj.c
    branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_stroke.c
    branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_undo.c
    branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2013-cycles_volume/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_clip/space_clip.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_image/image_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_info/textview.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_logic/logic_ops.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_draw.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_intern.h
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_select.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_view.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_node/space_node.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_draw.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_sequencer/sequencer_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_text/text_intern.h
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/drawarmature.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_edit.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_ruler.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_select.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_view.c
    branches/soc-2013-cycles_volume/source/blender/editors/transform/transform.c
    branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_generics.c
    branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_snap.c
    branches/soc-2013-cycles_volume/source/blender/editors/util/crazyspace.c
    branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_parametrizer.c
    branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_parametrizer.h
    branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/TextStrokeRenderer.cpp
    branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/TextStrokeRenderer.h
    branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMapBuilder.cpp
    branches/soc-2013-cycles_volume/source/blender/gpu/GPU_extensions.h
    branches/soc-2013-cycles_volume/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2013-cycles_volume/source/blender/gpu/shaders/gpu_shader_material.glsl
    branches/soc-2013-cycles_volume/source/blender/imbuf/IMB_colormanagement.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/IMB_imbuf.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/IMB_allocimbuf.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/IMB_colormanagement_intern.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/IMB_filetype.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/IMB_indexer.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/IMB_metadata.h
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/allocimbuf.c
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/bmp.c
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/colormanagement.c
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/indexer.c
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/indexer_dv.c
    branches/soc-2013-cycles_volume/source/blender/imbuf/intern/metadata.c
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_color_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_constraint_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_customdata_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_freestyle_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_linestyle_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_mask_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_node_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_windowmanager_types.h
    branches/soc-2013-cycles_volume/source/blender/makesrna/RNA_enum_types.h
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/makesrna.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_ID.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_access.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_action.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_actuator.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_animviz.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_armature.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_boid.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_brush.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_color.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_constraint.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_controller.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_curve.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_dynamicpaint.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_internal.h
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_key.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_mask.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_material.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_mesh.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_mesh_api.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_meta.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_nla.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_object_force.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_packedfile.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_particle.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_pose.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_property.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_rigidbody.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_sensor.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_sequencer.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_space.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_text.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_ui.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_wm.c
    branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_wm_api.c
    branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_build.c
    branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_explode.c
    branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_meshcache_util.c
    branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_subsurf.c
    branches/soc-2013-cycles_volume/source/blender/nodes/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/blender/nodes/NOD_shader.h
    branches/soc-2013-cycles_volume/source/blender/nodes/NOD_static_types.h
    branches/soc-2013-cycles_volume/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2013-cycles_volume/source/blender/nodes/composite/nodes/node_composite_outputFile.c
    branches/soc-2013-cycles_volume/source/blender/nodes/intern/node_exec.c
    branches/soc-2013-cycles_volume/source/blender/nodes/texture/nodes/node_texture_common.c
    branches/soc-2013-cycles_volume/source/blender/python/intern/bpy_rna.c
    branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils.c
    branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Matrix.c
    branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Vector.c
    branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_geometry.c
    branches/soc-2013-cycles_volume/source/blender/render/extern/include/RE_pipeline.h
    branches/soc-2013-cycles_volume/source/blender/render/intern/include/texture_ocean.h
    branches/soc-2013-cycles_volume/source/blender/render/intern/source/external_engine.c
    branches/soc-2013-cycles_volume/source/blender/render/intern/source/pipeline.c
    branches/soc-2013-cycles_volume/source/blender/render/intern/source/rayshade.c
    branches/soc-2013-cycles_volume/source/blender/render/intern/source/texture_ocean.c
    branches/soc-2013-cycles_volume/source/blender/render/intern/source/voxeldata.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/WM_api.h
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_cursors.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_dragdrop.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_event_system.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_files.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_operators.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_playanim.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_window.c
    branches/soc-2013-cycles_volume/source/blender/windowmanager/wm_window.h
    branches/soc-2013-cycles_volume/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2013-cycles_volume/source/creator/CMakeLists.txt
    branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_ConvertActuators.cpp
    branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_GameObject.cpp
    branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_GameObject.h
    branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_TouchEventManager.cpp
    branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.cpp
    branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
    branches/soc-2013-cycles_volume/source/tests/bl_run_operators.py
    branches/soc-2013-cycles_volume/source/tools/CTS/FBlender.py
    branches/soc-2013-cycles_volume/source/tools/CTS/README.txt

Added Paths:
-----------
    branches/soc-2013-cycles_volume/intern/cycles/kernel/closure/bsdf_hair.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_path_state.h
    branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_hair_bsdf.osl
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.c
    branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_NDOFManager3Dconnexion.h
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/camera_response/
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_advantix_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_advantix_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_advantix_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_ct_precisa_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_ct_precisa_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_050.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_100_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_200_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_400_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_optima_ii_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_optima_ii_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_ultra_050.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_800.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981111.slrr.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981111.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981113.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981114.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_12min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_4min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_5min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_6min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_f-125.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_f-250.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_f-400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_fci.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_fp2900z.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3151.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3152.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3153.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3154.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3155.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3156.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_100_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_320t.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_400x.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_64.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_64t.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_e100s.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_gold_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_gold_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kaf-2001.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kaf-3000.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kai-0311.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kai-0372.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kai-1010.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_25.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_64.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_max_zoom_800.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_100t.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_160nc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_160vc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_400nc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_400vc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_800.spi1d
    branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mesh_evaluate.c
    branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_convexhull2d.h
    branches/soc-2013-cycles_volume/source/blender/blenlib/intern/convexhull2d.c
    branches/soc-2013-cycles_volume/source/blender/blenloader/intern/versioning_defaults.c
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_Debug.cpp
    branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_Debug.h
    branches/soc-2013-cycles_volume/source/blender/editors/curve/editcurve_add.c
    branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_bsdf_hair.c

Removed Paths:
-------------
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_advantix_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_advantix_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_advantix_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_ct_precisa_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_ct_precisa_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_050.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfachrome_rsx2_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_futura_ii_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_100_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_200_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_hdc_400_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_optima_ii_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_optima_ii_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_ultra_050.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/agfa_agfacolor_vista_800.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981111.slrr.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981111.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981113.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/canon_optura_981114.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_12min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_4min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_5min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/eastman_double_x_neg_6min.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_f-125.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_f-250.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_f-400.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_fci.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/fujifilm_fp2900z.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3151.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3152.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3153.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3154.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3155.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_dscs_3156.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_100_plus.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_320t.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_400x.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_64.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_64t.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_ektachrome_e100s.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_gold_100.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_gold_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kaf-2001.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kaf-3000.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kai-0311.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kai-0372.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kai-1010.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_200.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_25.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_kodachrome_64.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_max_zoom_800.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_100t.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_160nc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_160vc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_400nc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_400vc.spi1d
    branches/soc-2013-cycles_volume/release/datafiles/colormanagement/luts/film_response/kodak_portra_800.spi1d

Property Changed:
----------------
    branches/soc-2013-cycles_volume/
    branches/soc-2013-cycles_volume/source/blender/editors/interface/interface.c
    branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/


Property changes on: branches/soc-2013-cycles_volume
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-59901
   + /branches/ge_dev:58091-58422
/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/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-60196

Modified: branches/soc-2013-cycles_volume/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/CMakeLists.txt	2013-09-17 14:20:00 UTC (rev 60201)
+++ branches/soc-2013-cycles_volume/CMakeLists.txt	2013-09-17 14:49:11 UTC (rev 60202)
@@ -321,9 +321,22 @@
 		set(OSX_SYSTEM unsupported)
 	endif()
 	message(STATUS "Detected system-version: " ${OSX_SYSTEM})
-
+	
+	# workaround for incorrect cmake xcode lookup for developer previews - XCODE_VERSION does not take xcode-select path into accout
+	# but would always look into /Applications/Xcode.app while dev versions are named Xcode<version>-DP<preview_number>
+	execute_process(COMMAND xcode-select --print-path  OUTPUT_VARIABLE XCODE_CHECK OUTPUT_STRIP_TRAILING_WHITESPACE)
+	string(REPLACE "/Contents/Developer" "" XCODE_BUNDLE ${XCODE_CHECK}) # truncate to bundlepath in any case
+	message(STATUS "Xcode-bundle : " ${XCODE_BUNDLE})
+	
 	if(${CMAKE_GENERATOR} MATCHES "Xcode")
 	
+		if(${XCODE_VERSION} VERSION_GREATER 4.2) # earlier xcode has no bundled developer dir, no sense in getting xcode path from
+			string(SUBSTRING "${XCODE_CHECK}" 14 6 DP_NAME) # reduce to XCode name without dp extension
+			if(${DP_NAME} MATCHES Xcode5)
+				set(XCODE_VERSION 5)
+			endif()
+		endif()
+
 		##### cmake incompatibility with xcode  4.3 and higher #####
 		if(${XCODE_VERSION} MATCHES '') # cmake fails due looking for xcode in the wrong path, thus will be empty var
 			message(FATAL_ERROR "Xcode 4.3 and higher must be used with cmake 2.8-8 or higher")
@@ -347,9 +360,10 @@
 	if(${XCODE_VERSION} VERSION_LESS 4.3)
 		set(CMAKE_OSX_SYSROOT /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk CACHE PATH "" FORCE)  # use guaranteed existing sdk
 	else()
-		# note: i don't use xcode-select path on purpose, cause also /Applications/Xcode.app would be allowed
-		# absolute pathes are more foolproof here !
-		set(OSX_SYSROOT_PREFIX /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform)
+		# note: xcode-select path could be ambigous, cause /Applications/Xcode.app/Contents/Developer or /Applications/Xcode.app would be allowed
+		# so i use a selfcomposed bundlepath here  
+		set(OSX_SYSROOT_PREFIX ${XCODE_BUNDLE}/Contents/Developer/Platforms/MacOSX.platform)
+		message(STATUS "OSX_SYSROOT_PREFIX: " ${OSX_SYSROOT_PREFIX})
 		set(OSX_DEVELOPER_PREFIX /Developer/SDKs/MacOSX${OSX_SYSTEM}.sdk) # use guaranteed existing sdk
 		set(CMAKE_OSX_SYSROOT ${OSX_SYSROOT_PREFIX}/${OSX_DEVELOPER_PREFIX} CACHE PATH "" FORCE)
 	endif()
@@ -1636,7 +1650,7 @@
 		endif()
 
 	if(WITH_JACK)
-		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -weak_framework jackmp")
+		set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -F/Library/Frameworks -weak_framework jackmp")
 	endif()
 
 	else()
@@ -1795,6 +1809,15 @@
 		set(CMAKE_C_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 		set(CMAKE_CXX_FLAGS_RELEASE "-mdynamic-no-pic -fno-strict-aliasing")
 	endif()
+
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+		if(${CMAKE_GENERATOR} MATCHES "Xcode")
+			if(${XCODE_VERSION} VERSION_EQUAL 5 OR ${XCODE_VERSION} VERSION_GREATER 5)
+				# Xcode 5 has too low template depth of 128 for libmv
+				set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ftemplate-depth=1024")
+			endif()
+		endif()
+	endif()
 endif()
 
 #-----------------------------------------------------------------------------

Modified: branches/soc-2013-cycles_volume/SConstruct
===================================================================
--- branches/soc-2013-cycles_volume/SConstruct	2013-09-17 14:20:00 UTC (rev 60201)
+++ branches/soc-2013-cycles_volume/SConstruct	2013-09-17 14:49:11 UTC (rev 60202)
@@ -294,6 +294,9 @@
         print  B.bc.OKGREEN + "Auto-setting available MacOSX SDK -> " + B.bc.ENDC + "MacOSX10.6.sdk"
     else:
         print B.bc.OKGREEN + "Found recommended sdk :" + B.bc.ENDC + " using MacOSX10.5.sdk"
+		
+    if env['CXX'].startswith('clang') and env['XCODE_CUR_VER'] >= '5':
+        env['CCFLAGS'].append('-ftemplate-depth=1024') # only valid for clang bundled with xcode 5
 
     # for now, Mac builders must download and install the 3DxWare 10 Beta 4 driver framework from 3Dconnexion
     # necessary header file lives here when installed:
@@ -314,7 +317,7 @@
             print "JackOSX install not found, disabling WITH_BF_JACK" # avoid build errors !
             env['WITH_BF_JACK'] = 0
         else:
-            env.Append(LINKFLAGS=['-L/Library/Frameworks','-Xlinker','-weak_framework','-Xlinker','Jackmp'])
+            env.Append(LINKFLAGS=['-F/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

Modified: branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh	2013-09-17 14:20:00 UTC (rev 60201)
+++ branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh	2013-09-17 14:49:11 UTC (rev 60202)
@@ -25,10 +25,10 @@
 ARGS=$( \
 getopt \
 -o s:i:t:h \
---long source:,install:,tmp:,threads:,help,with-all,with-osl,with-opencollada,all-static,force-all,\
+--long source:,install:,tmp:,threads:,help,with-all,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 \
+skip-opencollada,required-numpy \
 -- "$@" \
 )
 
@@ -42,16 +42,13 @@
 # Do not install some optional, potentially conflicting libs by default...
 WITH_ALL=false
 
-# Do not yet enable osl, use --with-osl (or --with-all) option to try it.
-WITH_OSL=false
-
 # Do not yet enable opencollada, use --with-opencollada (or --with-all) option to try it.
 WITH_OPENCOLLADA=false
 
 # Try to link everything statically. Use this to produce portable versions of blender.
 ALL_STATIC=false
 
-THREADS=`cat /proc/cpuinfo | grep cores | uniq | sed -e "s/.*: *\(.*\)/\\1/"`
+THREADS=`cat /proc/cpuinfo | grep processor | wc -l`
 if [ -z "$THREADS" ]; then
   THREADS=1
 fi
@@ -63,7 +60,6 @@
 
 Number of threads for building: \$THREADS (automatically detected, use --threads=<nbr> to override it).
 Full install: \$WITH_ALL (use --with-all option to enable it).
-Building OSL: \$WITH_OSL (use --with-osl option to enable it).
 Building OpenCOLLADA: \$WITH_OPENCOLLADA (use --with-opencollada option to enable it).
 All static linking: \$ALL_STATIC (use --all-static option to enable it).
 
@@ -96,10 +92,6 @@
         how your package system is set…).
         Note this option also implies all other (more specific) --with-foo options below.
 
-    --with-osl
-        Try to install or build the OpenShadingLanguage libraries (and their dependencies).
-        Still experimental!
-
     --with-opencollada
         Build and install the OpenCOLLADA libraries.
 
@@ -174,11 +166,15 @@
         Unconditionally skip OpenCOLLADA installation/building.
 
     --skip-ffmpeg
-        Unconditionally skip FFMpeg installation/building.\""
+        Unconditionally skip FFMpeg installation/building.
 
+    --required-numpy
+        Use this in case your distro features a valid python package, but no matching Numpy one.
+        It will force compilation of both python 3.3 and numpy 1.7.\""
+
 ##### Main Vars #####
 
-PYTHON_VERSION="3.3.0"
+PYTHON_VERSION="3.3.2"
 PYTHON_VERSION_MIN="3.3"
 PYTHON_SOURCE="http://python.org/ftp/python/$PYTHON_VERSION/Python-$PYTHON_VERSION.tar.bz2"
 PYTHON_FORCE_REBUILD=false
@@ -189,6 +185,7 @@
 NUMPY_SOURCE="http://sourceforge.net/projects/numpy/files/NumPy/$NUMPY_VERSION/numpy-$NUMPY_VERSION.tar.gz"
 NUMPY_FORCE_REBUILD=false
 NUMPY_SKIP=false
+NUMPY_REQUIRED=false
 
 BOOST_VERSION="1.51.0"
 _boost_version_nodots=`echo "$BOOST_VERSION" | sed -r 's/\./_/g'`

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list