[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41702] branches/soc-2011-carrot: Merge with trunk r41701

Miika Hamalainen miika.hamalainen at kolumbus.fi
Wed Nov 9 16:46:55 CET 2011


Revision: 41702
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41702
Author:   miikah
Date:     2011-11-09 15:46:53 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
Merge with trunk r41701

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

Modified Paths:
--------------
    branches/soc-2011-carrot/CMakeLists.txt
    branches/soc-2011-carrot/SConstruct
    branches/soc-2011-carrot/build_files/cmake/cmake_consistency_check.py
    branches/soc-2011-carrot/build_files/cmake/cmake_netbeans_project.py
    branches/soc-2011-carrot/build_files/cmake/config/blender_lite.cmake
    branches/soc-2011-carrot/build_files/scons/config/darwin-config.py
    branches/soc-2011-carrot/build_files/scons/config/linux-config.py
    branches/soc-2011-carrot/build_files/scons/config/win32-mingw-config.py
    branches/soc-2011-carrot/build_files/scons/config/win32-vc-config.py
    branches/soc-2011-carrot/build_files/scons/config/win64-vc-config.py
    branches/soc-2011-carrot/build_files/scons/tools/Blender.py
    branches/soc-2011-carrot/build_files/scons/tools/btools.py
    branches/soc-2011-carrot/doc/python_api/examples/bpy.app.handlers.1.py
    branches/soc-2011-carrot/doc/python_api/examples/bpy.app.handlers.py
    branches/soc-2011-carrot/extern/libmv/CMakeLists.txt
    branches/soc-2011-carrot/extern/libmv/SConscript
    branches/soc-2011-carrot/extern/libmv/bundle.sh
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/euclidean_resection.cc
    branches/soc-2011-carrot/extern/libmv/patches/mingw.patch
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/utilities.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/logging.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/port.h
    branches/soc-2011-carrot/intern/CMakeLists.txt
    branches/soc-2011-carrot/intern/SConscript
    branches/soc-2011-carrot/intern/audaspace/CMakeLists.txt
    branches/soc-2011-carrot/release/datafiles/fonts/droidsans.ttf.gz
    branches/soc-2011-carrot/release/scripts/modules/bpy/ops.py
    branches/soc-2011-carrot/release/scripts/modules/bpyml_ui.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/add_mesh_torus.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/object_quick_effects.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/presets.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/uvcalc_smart_project.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_camera.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_lamp.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_data_modifier.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_game.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_material.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_object.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_cloth.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_physics_fluid.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/properties_render.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_image.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_userpref_keymap.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_view3d_toolbar.py
    branches/soc-2011-carrot/source/blender/SConscript
    branches/soc-2011-carrot/source/blender/blenfont/BLF_translation.h
    branches/soc-2011-carrot/source/blender/blenfont/intern/blf_translation.c
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_DerivedMesh.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_blender.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_node.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_texture.h
    branches/soc-2011-carrot/source/blender/blenkernel/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenkernel/intern/DerivedMesh.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/cdderivedmesh.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/depsgraph.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/dynamicpaint.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/node.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/subsurf_ccg.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/texture.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-carrot/source/blender/blenloader/intern/readfile.c
    branches/soc-2011-carrot/source/blender/editors/armature/reeb.c
    branches/soc-2011-carrot/source/blender/editors/include/ED_uvedit.h
    branches/soc-2011-carrot/source/blender/editors/include/UI_interface.h
    branches/soc-2011-carrot/source/blender/editors/interface/interface.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_intern.h
    branches/soc-2011-carrot/source/blender/editors/interface/interface_panel.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_regions.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_templates.c
    branches/soc-2011-carrot/source/blender/editors/interface/interface_widgets.c
    branches/soc-2011-carrot/source/blender/editors/interface/resources.c
    branches/soc-2011-carrot/source/blender/editors/mesh/mesh_data.c
    branches/soc-2011-carrot/source/blender/editors/object/object_add.c
    branches/soc-2011-carrot/source/blender/editors/screen/screen_context.c
    branches/soc-2011-carrot/source/blender/editors/sculpt_paint/paint_image.c
    branches/soc-2011-carrot/source/blender/editors/space_buttons/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_context.c
    branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_buttons/space_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_image/space_image.c
    branches/soc-2011-carrot/source/blender/editors/space_node/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_node/SConscript
    branches/soc-2011-carrot/source/blender/editors/space_node/drawnode.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_edit.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_header.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/drawmesh.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/drawobject.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_view3d/view3d_snap.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_conversions.c
    branches/soc-2011-carrot/source/blender/editors/transform/transform_generics.c
    branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_ops.c
    branches/soc-2011-carrot/source/blender/editors/uvedit/uvedit_unwrap_ops.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_material.c
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_shader_material.glsl
    branches/soc-2011-carrot/source/blender/gpu/intern/gpu_shader_material.glsl.c
    branches/soc-2011-carrot/source/blender/imbuf/intern/anim_movie.c
    branches/soc-2011-carrot/source/blender/makesdna/DNA_modifier_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_node_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_space_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_texture_types.h
    branches/soc-2011-carrot/source/blender/makesrna/RNA_access.h
    branches/soc-2011-carrot/source/blender/makesrna/RNA_types.h
    branches/soc-2011-carrot/source/blender/makesrna/SConscript
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_access.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_define.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_movieclip.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_nodetree_types.h
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_object_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_render.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_scene.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_space.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_texture.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_ui_api.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_userdef.c
    branches/soc-2011-carrot/source/blender/modifiers/intern/MOD_dynamicpaint.c
    branches/soc-2011-carrot/source/blender/nodes/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/nodes/NOD_shader.h
    branches/soc-2011-carrot/source/blender/nodes/SConscript
    branches/soc-2011-carrot/source/blender/nodes/composite/node_composite_tree.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_mapValue.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2011-carrot/source/blender/nodes/intern/node_socket.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_tree.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.c
    branches/soc-2011-carrot/source/blender/nodes/shader/node_shader_util.h
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_geom.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mapping.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_math.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_rgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_texture.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_value.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_vectMath.c
    branches/soc-2011-carrot/source/blender/nodes/texture/node_texture_tree.c
    branches/soc-2011-carrot/source/blender/python/SConscript
    branches/soc-2011-carrot/source/blender/python/intern/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/python/intern/bpy_interface.c
    branches/soc-2011-carrot/source/blender/python/intern/bpy_rna.c
    branches/soc-2011-carrot/source/blender/render/intern/source/occlusion.c
    branches/soc-2011-carrot/source/blender/render/intern/source/render_texture.c
    branches/soc-2011-carrot/source/blenderplayer/bad_level_call_stubs/stubs.c
    branches/soc-2011-carrot/source/creator/CMakeLists.txt

Added Paths:
-----------
    branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenImageIO.cmake
    branches/soc-2011-carrot/intern/cycles/
    branches/soc-2011-carrot/intern/cycles/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/SConscript
    branches/soc-2011-carrot/intern/cycles/app/
    branches/soc-2011-carrot/intern/cycles/app/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/app/cycles_server.cpp
    branches/soc-2011-carrot/intern/cycles/app/cycles_test.cpp
    branches/soc-2011-carrot/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-carrot/intern/cycles/app/cycles_xml.h
    branches/soc-2011-carrot/intern/cycles/blender/
    branches/soc-2011-carrot/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/blender/addon/
    branches/soc-2011-carrot/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/engine.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/enums.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/presets.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/properties.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/ui.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/xml.py
    branches/soc-2011-carrot/intern/cycles/blender/blender_camera.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_python.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_session.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_session.h
    branches/soc-2011-carrot/intern/cycles/blender/blender_shader.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_sync.h
    branches/soc-2011-carrot/intern/cycles/blender/blender_util.h
    branches/soc-2011-carrot/intern/cycles/bvh/
    branches/soc-2011-carrot/intern/cycles/bvh/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/bvh/bvh.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_build.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_node.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_node.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_params.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_sort.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_sort.h
    branches/soc-2011-carrot/intern/cycles/cmake/
    branches/soc-2011-carrot/intern/cycles/cmake/external_libs.cmake
    branches/soc-2011-carrot/intern/cycles/device/
    branches/soc-2011-carrot/intern/cycles/device/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/device/device.cpp
    branches/soc-2011-carrot/intern/cycles/device/device.h
    branches/soc-2011-carrot/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_intern.h
    branches/soc-2011-carrot/intern/cycles/device/device_memory.h
    branches/soc-2011-carrot/intern/cycles/device/device_multi.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_network.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_network.h
    branches/soc-2011-carrot/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-carrot/intern/cycles/doc/
    branches/soc-2011-carrot/intern/cycles/doc/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/
    branches/soc-2011-carrot/intern/cycles/doc/license/Apache_2.0.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/Blender.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/Boost.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/GPL.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/ILM.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/NVidia.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/OSL.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/Sobol.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/readme.txt
    branches/soc-2011-carrot/intern/cycles/kernel/
    branches/soc-2011-carrot/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.cl
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.cu
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_camera.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_differential.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_displace.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_emission.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_film.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_globals.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_light.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_math.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_mbvh.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_object.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_qbvh.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_random.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_textures.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_triangle.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/
    branches/soc-2011-carrot/intern/cycles/kernel/osl/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/kernel/osl/background.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_diffuse.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_microfacet.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_reflection.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_refraction.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_transparent.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_ward.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_westin.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bssrdf.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/debug.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/emissive.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_add_closure.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_attribute.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_background.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_bump.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_color.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_emission.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_fresnel.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_fresnel.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_geometry.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_holdout.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_image_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_light_path.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_mapping.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_math.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_output_surface.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_output_volume.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_texture.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_value.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_vector_math.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/stdosl.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_closures.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_globals.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/vol_subsurface.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/svm/
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_diffuse.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_reflection.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_refraction.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_transparent.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_ward.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_westin.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/emissive.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_attribute.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_bsdf.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_convert.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_displace.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_fresnel.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_gradient.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_image.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_light_path.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_magic.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_mapping.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_math.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_noise.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_noisetex.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_sky.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_value.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_voronoi.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/volume.h
    branches/soc-2011-carrot/intern/cycles/render/
    branches/soc-2011-carrot/intern/cycles/render/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/render/attribute.cpp
    branches/soc-2011-carrot/intern/cycles/render/attribute.h
    branches/soc-2011-carrot/intern/cycles/render/background.cpp
    branches/soc-2011-carrot/intern/cycles/render/background.h
    branches/soc-2011-carrot/intern/cycles/render/buffers.cpp
    branches/soc-2011-carrot/intern/cycles/render/buffers.h
    branches/soc-2011-carrot/intern/cycles/render/camera.cpp
    branches/soc-2011-carrot/intern/cycles/render/camera.h
    branches/soc-2011-carrot/intern/cycles/render/film.cpp
    branches/soc-2011-carrot/intern/cycles/render/film.h
    branches/soc-2011-carrot/intern/cycles/render/film_response.cpp
    branches/soc-2011-carrot/intern/cycles/render/film_response.h
    branches/soc-2011-carrot/intern/cycles/render/filter.cpp
    branches/soc-2011-carrot/intern/cycles/render/filter.h
    branches/soc-2011-carrot/intern/cycles/render/graph.cpp
    branches/soc-2011-carrot/intern/cycles/render/graph.h
    branches/soc-2011-carrot/intern/cycles/render/image.cpp
    branches/soc-2011-carrot/intern/cycles/render/image.h
    branches/soc-2011-carrot/intern/cycles/render/integrator.cpp
    branches/soc-2011-carrot/intern/cycles/render/integrator.h
    branches/soc-2011-carrot/intern/cycles/render/light.cpp
    branches/soc-2011-carrot/intern/cycles/render/light.h
    branches/soc-2011-carrot/intern/cycles/render/mesh.cpp
    branches/soc-2011-carrot/intern/cycles/render/mesh.h
    branches/soc-2011-carrot/intern/cycles/render/mesh_displace.cpp
    branches/soc-2011-carrot/intern/cycles/render/nodes.cpp
    branches/soc-2011-carrot/intern/cycles/render/nodes.h
    branches/soc-2011-carrot/intern/cycles/render/object.cpp
    branches/soc-2011-carrot/intern/cycles/render/object.h
    branches/soc-2011-carrot/intern/cycles/render/osl.cpp
    branches/soc-2011-carrot/intern/cycles/render/osl.h
    branches/soc-2011-carrot/intern/cycles/render/scene.cpp
    branches/soc-2011-carrot/intern/cycles/render/scene.h
    branches/soc-2011-carrot/intern/cycles/render/session.cpp
    branches/soc-2011-carrot/intern/cycles/render/session.h
    branches/soc-2011-carrot/intern/cycles/render/shader.cpp
    branches/soc-2011-carrot/intern/cycles/render/shader.h
    branches/soc-2011-carrot/intern/cycles/render/sobol.cpp
    branches/soc-2011-carrot/intern/cycles/render/sobol.h
    branches/soc-2011-carrot/intern/cycles/render/svm.cpp
    branches/soc-2011-carrot/intern/cycles/render/svm.h
    branches/soc-2011-carrot/intern/cycles/render/tile.cpp
    branches/soc-2011-carrot/intern/cycles/render/tile.h
    branches/soc-2011-carrot/intern/cycles/subd/
    branches/soc-2011-carrot/intern/cycles/subd/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/subd/subd_build.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_build.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_dice.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_dice.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_edge.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_face.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_mesh.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_mesh.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_patch.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_patch.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_ring.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_ring.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_split.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_split.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_stencil.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_stencil.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_vert.h
    branches/soc-2011-carrot/intern/cycles/util/
    branches/soc-2011-carrot/intern/cycles/util/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/util/util_algorithm.h
    branches/soc-2011-carrot/intern/cycles/util/util_args.h
    branches/soc-2011-carrot/intern/cycles/util/util_boundbox.h
    branches/soc-2011-carrot/intern/cycles/util/util_cache.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_cache.h
    branches/soc-2011-carrot/intern/cycles/util/util_color.h
    branches/soc-2011-carrot/intern/cycles/util/util_cuda.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_cuda.h
    branches/soc-2011-carrot/intern/cycles/util/util_debug.h
    branches/soc-2011-carrot/intern/cycles/util/util_dynlib.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_dynlib.h
    branches/soc-2011-carrot/intern/cycles/util/util_foreach.h
    branches/soc-2011-carrot/intern/cycles/util/util_function.h
    branches/soc-2011-carrot/intern/cycles/util/util_hash.h
    branches/soc-2011-carrot/intern/cycles/util/util_image.h
    branches/soc-2011-carrot/intern/cycles/util/util_list.h
    branches/soc-2011-carrot/intern/cycles/util/util_map.h
    branches/soc-2011-carrot/intern/cycles/util/util_math.h
    branches/soc-2011-carrot/intern/cycles/util/util_md5.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_md5.h
    branches/soc-2011-carrot/intern/cycles/util/util_memarena.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_memarena.h
    branches/soc-2011-carrot/intern/cycles/util/util_opencl.c
    branches/soc-2011-carrot/intern/cycles/util/util_opencl.h
    branches/soc-2011-carrot/intern/cycles/util/util_opengl.h
    branches/soc-2011-carrot/intern/cycles/util/util_param.h
    branches/soc-2011-carrot/intern/cycles/util/util_path.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_path.h
    branches/soc-2011-carrot/intern/cycles/util/util_progress.h
    branches/soc-2011-carrot/intern/cycles/util/util_set.h
    branches/soc-2011-carrot/intern/cycles/util/util_string.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_string.h
    branches/soc-2011-carrot/intern/cycles/util/util_system.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_system.h
    branches/soc-2011-carrot/intern/cycles/util/util_thread.h
    branches/soc-2011-carrot/intern/cycles/util/util_time.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_time.h
    branches/soc-2011-carrot/intern/cycles/util/util_transform.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_transform.h
    branches/soc-2011-carrot/intern/cycles/util/util_types.h
    branches/soc-2011-carrot/intern/cycles/util/util_vector.h
    branches/soc-2011-carrot/intern/cycles/util/util_view.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_view.h
    branches/soc-2011-carrot/intern/cycles/util/util_xml.h
    branches/soc-2011-carrot/release/scripts/presets/cycles/
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/direct_light.py
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/full_global_illumination.py
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/limited_global_illumination.py
    branches/soc-2011-carrot/source/blender/editors/space_buttons/buttons_texture.c
    branches/soc-2011-carrot/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_add_shader.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_attribute.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_background.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_anisotropic.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_diffuse.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_glass.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_glossy.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_translucent.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_transparent.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_bsdf_velvet.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_emission.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_fresnel.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_geometry.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_holdout.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_layer_weight.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_light_path.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_mix_shader.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output_lamp.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output_material.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_output_world.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_coord.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_environment.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_gradient.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_image.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_magic.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_musgrave.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_noise.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_voronoi.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_tex_wave.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_volume_isotropic.c
    branches/soc-2011-carrot/source/blender/nodes/shader/nodes/node_shader_volume_transparent.c

Removed Paths:
-------------
    branches/soc-2011-carrot/intern/cycles/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/app/
    branches/soc-2011-carrot/intern/cycles/app/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/app/cycles_server.cpp
    branches/soc-2011-carrot/intern/cycles/app/cycles_test.cpp
    branches/soc-2011-carrot/intern/cycles/app/cycles_xml.cpp
    branches/soc-2011-carrot/intern/cycles/app/cycles_xml.h
    branches/soc-2011-carrot/intern/cycles/blender/
    branches/soc-2011-carrot/intern/cycles/blender/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/blender/addon/
    branches/soc-2011-carrot/intern/cycles/blender/addon/__init__.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/engine.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/enums.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/presets.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/properties.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/ui.py
    branches/soc-2011-carrot/intern/cycles/blender/addon/xml.py
    branches/soc-2011-carrot/intern/cycles/blender/blender_camera.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_object.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_python.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_session.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_session.h
    branches/soc-2011-carrot/intern/cycles/blender/blender_shader.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_sync.cpp
    branches/soc-2011-carrot/intern/cycles/blender/blender_sync.h
    branches/soc-2011-carrot/intern/cycles/blender/blender_util.h
    branches/soc-2011-carrot/intern/cycles/bvh/
    branches/soc-2011-carrot/intern/cycles/bvh/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/bvh/bvh.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_build.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_build.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_node.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_node.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_params.h
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_sort.cpp
    branches/soc-2011-carrot/intern/cycles/bvh/bvh_sort.h
    branches/soc-2011-carrot/intern/cycles/cmake/
    branches/soc-2011-carrot/intern/cycles/cmake/external_libs.cmake
    branches/soc-2011-carrot/intern/cycles/device/
    branches/soc-2011-carrot/intern/cycles/device/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/device/device.cpp
    branches/soc-2011-carrot/intern/cycles/device/device.h
    branches/soc-2011-carrot/intern/cycles/device/device_cpu.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_cuda.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_intern.h
    branches/soc-2011-carrot/intern/cycles/device/device_memory.h
    branches/soc-2011-carrot/intern/cycles/device/device_multi.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_network.cpp
    branches/soc-2011-carrot/intern/cycles/device/device_network.h
    branches/soc-2011-carrot/intern/cycles/device/device_opencl.cpp
    branches/soc-2011-carrot/intern/cycles/doc/
    branches/soc-2011-carrot/intern/cycles/doc/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/
    branches/soc-2011-carrot/intern/cycles/doc/license/Apache_2.0.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/Blender.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/Boost.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/GPL.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/ILM.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/NVidia.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/OSL.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/Sobol.txt
    branches/soc-2011-carrot/intern/cycles/doc/license/readme.txt
    branches/soc-2011-carrot/intern/cycles/kernel/
    branches/soc-2011-carrot/intern/cycles/kernel/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.cl
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.cu
    branches/soc-2011-carrot/intern/cycles/kernel/kernel.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_camera.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_differential.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_displace.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_emission.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_film.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_globals.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_light.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_math.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_mbvh.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_object.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_path.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_qbvh.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_random.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_shader.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_textures.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_triangle.h
    branches/soc-2011-carrot/intern/cycles/kernel/kernel_types.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/
    branches/soc-2011-carrot/intern/cycles/kernel/osl/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/kernel/osl/background.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_diffuse.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_microfacet.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_reflection.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_refraction.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_transparent.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_ward.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bsdf_westin.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/bssrdf.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/debug.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/emissive.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_add_closure.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_attribute.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_background.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_bump.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_color.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_emission.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_fresnel.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_fresnel.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_geometry.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_holdout.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_image_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_light_path.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_mapping.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_math.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_mix.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_output_surface.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_output_volume.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_texture.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_value.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_vector_math.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
    branches/soc-2011-carrot/intern/cycles/kernel/osl/nodes/stdosl.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_closures.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_globals.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2011-carrot/intern/cycles/kernel/osl/vol_subsurface.cpp
    branches/soc-2011-carrot/intern/cycles/kernel/svm/
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_diffuse.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_microfacet.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_reflection.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_refraction.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_transparent.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_ward.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/bsdf_westin.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/emissive.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_attribute.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_bsdf.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_convert.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_displace.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_fresnel.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_gradient.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_image.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_light_path.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_magic.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_mapping.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_math.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_noise.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_noisetex.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_sky.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_value.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_voronoi.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2011-carrot/intern/cycles/kernel/svm/volume.h
    branches/soc-2011-carrot/intern/cycles/render/
    branches/soc-2011-carrot/intern/cycles/render/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/render/attribute.cpp
    branches/soc-2011-carrot/intern/cycles/render/attribute.h
    branches/soc-2011-carrot/intern/cycles/render/background.cpp
    branches/soc-2011-carrot/intern/cycles/render/background.h
    branches/soc-2011-carrot/intern/cycles/render/buffers.cpp
    branches/soc-2011-carrot/intern/cycles/render/buffers.h
    branches/soc-2011-carrot/intern/cycles/render/camera.cpp
    branches/soc-2011-carrot/intern/cycles/render/camera.h
    branches/soc-2011-carrot/intern/cycles/render/film.cpp
    branches/soc-2011-carrot/intern/cycles/render/film.h
    branches/soc-2011-carrot/intern/cycles/render/film_response.cpp
    branches/soc-2011-carrot/intern/cycles/render/film_response.h
    branches/soc-2011-carrot/intern/cycles/render/filter.cpp
    branches/soc-2011-carrot/intern/cycles/render/filter.h
    branches/soc-2011-carrot/intern/cycles/render/graph.cpp
    branches/soc-2011-carrot/intern/cycles/render/graph.h
    branches/soc-2011-carrot/intern/cycles/render/image.cpp
    branches/soc-2011-carrot/intern/cycles/render/image.h
    branches/soc-2011-carrot/intern/cycles/render/integrator.cpp
    branches/soc-2011-carrot/intern/cycles/render/integrator.h
    branches/soc-2011-carrot/intern/cycles/render/light.cpp
    branches/soc-2011-carrot/intern/cycles/render/light.h
    branches/soc-2011-carrot/intern/cycles/render/mesh.cpp
    branches/soc-2011-carrot/intern/cycles/render/mesh.h
    branches/soc-2011-carrot/intern/cycles/render/mesh_displace.cpp
    branches/soc-2011-carrot/intern/cycles/render/nodes.cpp
    branches/soc-2011-carrot/intern/cycles/render/nodes.h
    branches/soc-2011-carrot/intern/cycles/render/object.cpp
    branches/soc-2011-carrot/intern/cycles/render/object.h
    branches/soc-2011-carrot/intern/cycles/render/osl.cpp
    branches/soc-2011-carrot/intern/cycles/render/osl.h
    branches/soc-2011-carrot/intern/cycles/render/scene.cpp
    branches/soc-2011-carrot/intern/cycles/render/scene.h
    branches/soc-2011-carrot/intern/cycles/render/session.cpp
    branches/soc-2011-carrot/intern/cycles/render/session.h
    branches/soc-2011-carrot/intern/cycles/render/shader.cpp
    branches/soc-2011-carrot/intern/cycles/render/shader.h
    branches/soc-2011-carrot/intern/cycles/render/sobol.cpp
    branches/soc-2011-carrot/intern/cycles/render/sobol.h
    branches/soc-2011-carrot/intern/cycles/render/svm.cpp
    branches/soc-2011-carrot/intern/cycles/render/svm.h
    branches/soc-2011-carrot/intern/cycles/render/tile.cpp
    branches/soc-2011-carrot/intern/cycles/render/tile.h
    branches/soc-2011-carrot/intern/cycles/subd/
    branches/soc-2011-carrot/intern/cycles/subd/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/subd/subd_build.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_build.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_dice.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_dice.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_edge.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_face.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_mesh.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_mesh.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_patch.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_patch.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_ring.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_ring.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_split.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_split.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_stencil.cpp
    branches/soc-2011-carrot/intern/cycles/subd/subd_stencil.h
    branches/soc-2011-carrot/intern/cycles/subd/subd_vert.h
    branches/soc-2011-carrot/intern/cycles/util/
    branches/soc-2011-carrot/intern/cycles/util/CMakeLists.txt
    branches/soc-2011-carrot/intern/cycles/util/util_algorithm.h
    branches/soc-2011-carrot/intern/cycles/util/util_args.h
    branches/soc-2011-carrot/intern/cycles/util/util_boundbox.h
    branches/soc-2011-carrot/intern/cycles/util/util_cache.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_cache.h
    branches/soc-2011-carrot/intern/cycles/util/util_color.h
    branches/soc-2011-carrot/intern/cycles/util/util_cuda.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_cuda.h
    branches/soc-2011-carrot/intern/cycles/util/util_debug.h
    branches/soc-2011-carrot/intern/cycles/util/util_dynlib.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_dynlib.h
    branches/soc-2011-carrot/intern/cycles/util/util_foreach.h
    branches/soc-2011-carrot/intern/cycles/util/util_function.h
    branches/soc-2011-carrot/intern/cycles/util/util_hash.h
    branches/soc-2011-carrot/intern/cycles/util/util_image.h
    branches/soc-2011-carrot/intern/cycles/util/util_list.h
    branches/soc-2011-carrot/intern/cycles/util/util_map.h
    branches/soc-2011-carrot/intern/cycles/util/util_math.h
    branches/soc-2011-carrot/intern/cycles/util/util_md5.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_md5.h
    branches/soc-2011-carrot/intern/cycles/util/util_memarena.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_memarena.h
    branches/soc-2011-carrot/intern/cycles/util/util_opencl.c
    branches/soc-2011-carrot/intern/cycles/util/util_opencl.h
    branches/soc-2011-carrot/intern/cycles/util/util_opengl.h
    branches/soc-2011-carrot/intern/cycles/util/util_param.h
    branches/soc-2011-carrot/intern/cycles/util/util_path.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_path.h
    branches/soc-2011-carrot/intern/cycles/util/util_progress.h
    branches/soc-2011-carrot/intern/cycles/util/util_set.h
    branches/soc-2011-carrot/intern/cycles/util/util_string.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_string.h
    branches/soc-2011-carrot/intern/cycles/util/util_system.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_system.h
    branches/soc-2011-carrot/intern/cycles/util/util_thread.h
    branches/soc-2011-carrot/intern/cycles/util/util_time.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_time.h
    branches/soc-2011-carrot/intern/cycles/util/util_transform.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_transform.h
    branches/soc-2011-carrot/intern/cycles/util/util_types.h
    branches/soc-2011-carrot/intern/cycles/util/util_vector.h
    branches/soc-2011-carrot/intern/cycles/util/util_view.cpp
    branches/soc-2011-carrot/intern/cycles/util/util_view.h
    branches/soc-2011-carrot/intern/cycles/util/util_xml.h
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/direct_light.py
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/full_global_illumination.py
    branches/soc-2011-carrot/release/scripts/presets/cycles/integrator/limited_global_illumination.py

Property Changed:
----------------
    branches/soc-2011-carrot/
    branches/soc-2011-carrot/extern/libmv/CMakeLists.txt
    branches/soc-2011-carrot/extern/libmv/SConscript
    branches/soc-2011-carrot/extern/libmv/bundle.sh
    branches/soc-2011-carrot/extern/libmv/files.txt
    branches/soc-2011-carrot/extern/libmv/libmv/base/id_generator.h
    branches/soc-2011-carrot/extern/libmv/libmv/base/scoped_ptr.h
    branches/soc-2011-carrot/extern/libmv/libmv/base/vector.h
    branches/soc-2011-carrot/extern/libmv/libmv/base/vector_utils.h
    branches/soc-2011-carrot/extern/libmv/libmv/image/array_nd.h
    branches/soc-2011-carrot/extern/libmv/libmv/image/convolve.h
    branches/soc-2011-carrot/extern/libmv/libmv/image/image.h
    branches/soc-2011-carrot/extern/libmv/libmv/image/sample.h
    branches/soc-2011-carrot/extern/libmv/libmv/image/tuple.h
    branches/soc-2011-carrot/extern/libmv/libmv/logging/logging.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/conditioning.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/euclidean_resection.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/fundamental.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/nviewtriangulation.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/projection.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/resection.h
    branches/soc-2011-carrot/extern/libmv/libmv/multiview/triangulation.h
    branches/soc-2011-carrot/extern/libmv/libmv/numeric/dogleg.h
    branches/soc-2011-carrot/extern/libmv/libmv/numeric/function_derivative.h
    branches/soc-2011-carrot/extern/libmv/libmv/numeric/levenberg_marquardt.h
    branches/soc-2011-carrot/extern/libmv/libmv/numeric/numeric.h
    branches/soc-2011-carrot/extern/libmv/libmv/numeric/poly.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/bundle.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/camera_intrinsics.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/detect.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/initialize_reconstruction.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/intersect.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/pipeline.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/reconstruction.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/resect.h
    branches/soc-2011-carrot/extern/libmv/libmv/simple_pipeline/tracks.h
    branches/soc-2011-carrot/extern/libmv/libmv/tracking/klt_region_tracker.h
    branches/soc-2011-carrot/extern/libmv/libmv/tracking/pyramid_region_tracker.h
    branches/soc-2011-carrot/extern/libmv/libmv/tracking/region_tracker.h
    branches/soc-2011-carrot/extern/libmv/libmv/tracking/retrack_region_tracker.h
    branches/soc-2011-carrot/extern/libmv/libmv/tracking/sad.h
    branches/soc-2011-carrot/extern/libmv/libmv/tracking/trklt_region_tracker.h
    branches/soc-2011-carrot/extern/libmv/libmv-capi.cpp
    branches/soc-2011-carrot/extern/libmv/libmv-capi.h
    branches/soc-2011-carrot/extern/libmv/mkfiles.sh
    branches/soc-2011-carrot/extern/libmv/third_party/fast/fast.c
    branches/soc-2011-carrot/extern/libmv/third_party/fast/fast.h
    branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_10.c
    branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_11.c
    branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_12.c
    branches/soc-2011-carrot/extern/libmv/third_party/fast/fast_9.c
    branches/soc-2011-carrot/extern/libmv/third_party/fast/nonmax.c
    branches/soc-2011-carrot/extern/libmv/third_party/gflags/config.h
    branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags.h
    branches/soc-2011-carrot/extern/libmv/third_party/gflags/gflags_completions.h
    branches/soc-2011-carrot/extern/libmv/third_party/gflags/mutex.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/commandlineflags.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/googleinit.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/base/mutex.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config_linux.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/config_mac.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/demangle.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/log_severity.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/logging.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/raw_logging.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/glog/vlog_is_on.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_generic-inl.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_libunwind-inl.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_powerpc-inl.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_x86-inl.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/stacktrace_x86_64-inl.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/symbolize.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/utilities.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/config.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/log_severity.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/logging.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/raw_logging.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/glog/vlog_is_on.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/port.h
    branches/soc-2011-carrot/extern/libmv/third_party/glog/src/windows/preprocess.sh
    branches/soc-2011-carrot/extern/libmv/third_party/ldl/CMakeLists.txt
    branches/soc-2011-carrot/extern/libmv/third_party/ldl/Doc/lesser.txt
    branches/soc-2011-carrot/extern/libmv/third_party/ldl/Include/ldl.h
    branches/soc-2011-carrot/extern/libmv/third_party/ldl/README.txt
    branches/soc-2011-carrot/extern/libmv/third_party/ldl/Source/ldl.c
    branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/inttypes.h
    branches/soc-2011-carrot/extern/libmv/third_party/msinttypes/stdint.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/COPYING.TXT
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_cameramatrix.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_distortion.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.cpp
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Geometry/v3d_metricbundle.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_linear.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_linear_utils.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_mathutilities.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_optimization.cpp
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/Math/v3d_optimization.h
    branches/soc-2011-carrot/extern/libmv/third_party/ssba/README.TXT
    branches/soc-2011-carrot/intern/audaspace/OpenAL/
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Blender.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1100D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_1DS.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_500D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_550D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_5D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_600D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_60D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Canon_7D.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D300S.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D3100.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D35.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D5000.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D5100.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D7000.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Nikon_D90.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_Epic.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_2K.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_3K.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_camera/Red_One_4K.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/default.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/far_plane.py
    branches/soc-2011-carrot/release/scripts/presets/tracking_track_color/near_plane.py
    branches/soc-2011-carrot/release/scripts/startup/bl_operators/clip.py
    branches/soc-2011-carrot/release/scripts/startup/bl_ui/space_clip.py
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_movieclip.h
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_tracking.h
    branches/soc-2011-carrot/source/blender/blenkernel/intern/movieclip.c
    branches/soc-2011-carrot/source/blender/blenkernel/intern/tracking.c
    branches/soc-2011-carrot/source/blender/editors/include/ED_clip.h
    branches/soc-2011-carrot/source/blender/editors/space_clip/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/editors/space_clip/SConscript
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_buttons.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_editor.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_draw.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_graph_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_intern.h
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_toolbar.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/clip_utils.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/space_clip.c
    branches/soc-2011-carrot/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-carrot/source/blender/editors/space_outliner/
    branches/soc-2011-carrot/source/blender/makesdna/DNA_movieclip_types.h
    branches/soc-2011-carrot/source/blender/makesdna/DNA_tracking_types.h
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_movieclip.c
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_tracking.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_movieclip.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_moviedistortion.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_stabilize2d.c
    branches/soc-2011-carrot/source/blender/nodes/composite/nodes/node_composite_transform.c


Property changes on: branches/soc-2011-carrot
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/blender:36828-41625
   + /trunk/blender:36828-41701

Modified: branches/soc-2011-carrot/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/CMakeLists.txt	2011-11-09 15:12:57 UTC (rev 41701)
+++ branches/soc-2011-carrot/CMakeLists.txt	2011-11-09 15:46:53 UTC (rev 41702)
@@ -213,6 +213,10 @@
 endif()
 option(WITH_PYTHON_INSTALL       "Copy system python into the blender install folder" ON)
 
+# Cycles
+option(WITH_CYCLES			"Enable Cycles Render Engine" ON)
+OPTION(WITH_CYCLES_TEST		"Build cycles test application" OFF)
+
 # disable for now, but plan to support on all platforms eventually
 option(WITH_MEM_JEMALLOC   "Enable malloc replacement (http://www.canonware.com/jemalloc)" OFF)
 mark_as_advanced(WITH_MEM_JEMALLOC)
@@ -284,6 +288,12 @@
 	set(WITH_HEADLESS ON)
 endif()
 
+# auto enable openimageio and boost for cycles
+if(WITH_CYCLES)
+	set(WITH_OPENIMAGEIO ON)
+	set(WITH_BOOST ON)
+endif()
+
 TEST_SSE_SUPPORT(COMPILER_SSE_FLAG COMPILER_SSE2_FLAG)
 
 # don't store paths to libs for portable distrobution
@@ -492,12 +502,11 @@
 	endif()
 
 	if(WITH_BOOST)
-		set(BOOST "/usr" CACHE PATH "Boost Directory")
-
+		
+		# uses in build instructions to override include and library variables
 		if(NOT BOOST_CUSTOM)
-			set(BOOST_ROOT ${BOOST})
 			set(Boost_USE_MULTITHREADED ON)
-			find_package(Boost 1.34 REQUIRED COMPONENTS filesystem regex system thread)
+			find_package(Boost 1.34 COMPONENTS filesystem regex system thread)
 		endif()
 
 		set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -507,17 +516,16 @@
 	endif()
 
 	if(WITH_OPENIMAGEIO)
-		set(OPENIMAGEIO "/usr" CACHE PATH "OpenImageIO Directory")
+		find_package(OpenImageIO)
 
-		set(OPENIMAGEIO_ROOT_DIR ${OPENIMAGEIO})
-		find_package(OpenImageIO REQUIRED)
-
 		set(OPENIMAGEIO_LIBRARIES ${OPENIMAGEIO_LIBRARIES} ${PNG_LIBRARIES} ${JPEG_LIBRARIES} ${TIFF_LIBRARY} ${OPENEXR_LIBRARIES} ${ZLIB_LIBRARIES} ${BOOST_LIBRARIES})
 		set(OPENIMAGEIO_LIBPATH)  # TODO, remove and reference the absolute path everywhere
 		set(OPENIMAGEIO_DEFINITIONS)
 
 		if(NOT OPENIMAGEIO_FOUND)
 			set(WITH_OPENIMAGEIO OFF)
+			set(WITH_CYCLES OFF)
+			message(STATUS "OpenImageIO not found, disabling WITH_CYCLES")
 		endif()
 	endif()
 
@@ -843,7 +851,7 @@
 	else()
 		# keep GCC specific stuff here
 		if(CMAKE_COMPILER_IS_GNUCC)
-			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32")
+			set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi")
 			set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing")
 
 			add_definitions(-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE)
@@ -942,26 +950,26 @@
 		if(WITH_BOOST)
 			set(BOOST ${LIBDIR}/boost)
 			set(BOOST_INCLUDE_DIR ${BOOST}/include)
-			set(BOOST_POSTFIX "vc90-mt-s-1_46_1")
-			set(BOOST_DEBUG_POSTFIX "vc90-mt-sgd-1_46_1")
+			set(BOOST_POSTFIX "mgw45-mt-s-1_47")
+			set(BOOST_DEBUG_POSTFIX "mgw45-mt-sd-1_47")
 			set(BOOST_LIBRARIES
-				optimized libboost_date_time-${BOOST_POSTFIX} libboost_filesystem-${BOOST_POSTFIX}
-				libboost_regex-${BOOST_POSTFIX} libboost_system-${BOOST_POSTFIX} libboost_thread-${BOOST_POSTFIX}
-				debug libboost_date_time-${BOOST_DEBUG_POSTFIX} libboost_filesystem-${BOOST_DEBUG_POSTFIX}
-				libboost_regex-${BOOST_DEBUG_POSTFIX} libboost_system-${BOOST_DEBUG_POSTFIX} libboost_thread-${BOOST_DEBUG_POSTFIX})
-			set(BOOST_LIBPATH ${BOOST}/lib)
-			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB")
+				optimized boost_date_time-${BOOST_POSTFIX} boost_filesystem-${BOOST_POSTFIX}
+				boost_regex-${BOOST_POSTFIX} boost_system-${BOOST_POSTFIX} boost_thread-${BOOST_POSTFIX}
+				debug boost_date_time-${BOOST_DEBUG_POSTFIX} boost_filesystem-${BOOST_DEBUG_POSTFIX}
+				boost_regex-${BOOST_DEBUG_POSTFIX} boost_system-${BOOST_DEBUG_POSTFIX} boost_thread-${BOOST_DEBUG_POSTFIX})
+			set(BOOST_LIBPATH ${BOOST}/lib/gcc)
+			set(BOOST_DEFINITIONS "-DBOOST_ALL_NO_LIB -DBOOST_THREAD_USE_LIB ")
 		endif()
 			
 		if(WITH_OPENIMAGEIO)
-			set(OPENIMAGEIO ${LIBDIR}/openimageio)
+			set(OPENIMAGEIO ${LIBDIR}/gcc/openimageio)
 			set(OPENIMAGEIO_INCLUDE_DIRS ${OPENIMAGEIO}/include)
 			set(OPENIMAGEIO_LIBRARIES OpenImageIO)
 			set(OPENIMAGEIO_LIBPATH ${OPENIMAGEIO}/lib)
 			set(OPENIMAGEIO_DEFINITIONS)
 		endif()
 
-		set(PLATFORM_LINKFLAGS "--stack,2097152")
+		set(PLATFORM_LINKFLAGS "-Xlinker --stack=2097152")
 
 	endif()
 
@@ -1480,6 +1488,7 @@
 	info_cfg_option(WITH_FFTW3)
 	info_cfg_option(WITH_INTERNATIONAL)
 	info_cfg_option(WITH_INPUT_NDOF)
+	info_cfg_option(WITH_CYCLES)
 
 	info_cfg_text("Compiler Options:")
 	info_cfg_option(WITH_BUILDINFO)

Modified: branches/soc-2011-carrot/SConstruct
===================================================================
--- branches/soc-2011-carrot/SConstruct	2011-11-09 15:12:57 UTC (rev 41701)
+++ branches/soc-2011-carrot/SConstruct	2011-11-09 15:46:53 UTC (rev 41702)
@@ -435,12 +435,12 @@
 
 Export('env')
 
+BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
+SConscript(B.root_build_dir+'/source/SConscript')
 BuildDir(B.root_build_dir+'/intern', 'intern', duplicate=0)
 SConscript(B.root_build_dir+'/intern/SConscript')
 BuildDir(B.root_build_dir+'/extern', 'extern', duplicate=0)
 SConscript(B.root_build_dir+'/extern/SConscript')
-BuildDir(B.root_build_dir+'/source', 'source', duplicate=0)
-SConscript(B.root_build_dir+'/source/SConscript')
 
 # now that we have read all SConscripts, we know what
 # libraries will be built. Create list of
@@ -526,6 +526,50 @@
                 if len(source)==0:
                     env.Execute(Mkdir(dir))
                 scriptinstall.append(env.Install(dir=dir,source=source))
+        if env['WITH_BF_CYCLES']:
+            # cycles python code
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles')
+            source=os.listdir('intern/cycles/blender/addon')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source=['intern/cycles/blender/addon/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
+
+            # cycles kernel code
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel')
+            source=os.listdir('intern/cycles/kernel')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source.remove('kernel.cpp')
+            source.remove('CMakeLists.txt')
+            source.remove('svm')
+            source.remove('osl')
+            source=['intern/cycles/kernel/'+s for s in source]
+            source.append('intern/cycles/util/util_color.h')
+            source.append('intern/cycles/util/util_math.h')
+            source.append('intern/cycles/util/util_transform.h')
+            source.append('intern/cycles/util/util_types.h')
+            scriptinstall.append(env.Install(dir=dir,source=source))
+            # svm
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'kernel', 'svm')
+            source=os.listdir('intern/cycles/kernel/svm')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source=['intern/cycles/kernel/svm/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
+
+            # licenses
+            dir=os.path.join(env['BF_INSTALLDIR'], VERSION, 'scripts', 'addons','cycles', 'license')
+            source=os.listdir('intern/cycles/doc/license')
+            if '.svn' in source: source.remove('.svn')
+            if '_svn' in source: source.remove('_svn')
+            if '__pycache__' in source: source.remove('__pycache__')
+            source.remove('CMakeLists.txt')
+            source=['intern/cycles/doc/license/'+s for s in source]
+            scriptinstall.append(env.Install(dir=dir,source=source))
     
     if env['WITH_BF_INTERNATIONAL']:
         internationalpaths=['release' + os.sep + 'datafiles']
@@ -696,6 +740,9 @@
         dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb.dll')	
     dllsources.append('${LCGDIR}/thumbhandler/lib/BlendThumb64.dll')
 
+    if env['WITH_BF_OIIO']:
+        dllsources.append('${LCGDIR}/openimageio/bin/OpenImageIO.dll')
+
     dllsources.append('#source/icons/blender.exe.manifest')
 
     windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)

Copied: branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenImageIO.cmake (from rev 41675, trunk/blender/build_files/cmake/Modules/FindOpenImageIO.cmake)
===================================================================
--- branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenImageIO.cmake	                        (rev 0)
+++ branches/soc-2011-carrot/build_files/cmake/Modules/FindOpenImageIO.cmake	2011-11-09 15:46:53 UTC (rev 41702)
@@ -0,0 +1,70 @@
+# - Find OpenImageIO library
+# Find the native OpenImageIO includes and library
+# This module defines
+#  OPENIMAGEIO_INCLUDE_DIRS, where to find openimageio.h, Set when
+#                            OPENIMAGEIO_INCLUDE_DIR is found.
+#  OPENIMAGEIO_LIBRARIES, libraries to link against to use OpenImageIO.
+#  OPENIMAGEIO_ROOT_DIR, The base directory to search for OpenImageIO.
+#                        This can also be an environment variable.
+#  OPENIMAGEIO_FOUND, If false, do not try to use OpenImageIO.
+#
+# also defined, but not for general use are
+#  OPENIMAGEIO_LIBRARY, where to find the OpenImageIO library.
+
+#=============================================================================
+# Copyright 2011 Blender Foundation.
+#
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list