[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59337] branches/soc-2013-cycles_volume: - merge from trunk, up to r59211.
Rafael Campos
rafaelcdn at gmail.com
Tue Aug 20 22:05:49 CEST 2013
Revision: 59337
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59337
Author: jehuty
Date: 2013-08-20 20:05:47 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
- merge from trunk, up to r59211.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59211
Modified Paths:
--------------
branches/soc-2013-cycles_volume/CMakeLists.txt
branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_volume/build_files/cmake/cmake_static_check_cppcheck.py
branches/soc-2013-cycles_volume/build_files/cmake/cmake_static_check_smatch.py
branches/soc-2013-cycles_volume/build_files/cmake/cmake_static_check_sparse.py
branches/soc-2013-cycles_volume/build_files/cmake/project_source_info.py
branches/soc-2013-cycles_volume/build_files/scons/tools/Blender.py
branches/soc-2013-cycles_volume/doc/python_api/rst/bge.logic.rst
branches/soc-2013-cycles_volume/doc/python_api/rst/bge.render.rst
branches/soc-2013-cycles_volume/doc/python_api/rst/bge_types/bge.types.KX_Camera.rst
branches/soc-2013-cycles_volume/doc/python_api/rst/bge_types/bge.types.KX_GameObject.rst
branches/soc-2013-cycles_volume/extern/libmv/libmv/multiview/euclidean_resection.cc
branches/soc-2013-cycles_volume/extern/libmv/libmv/multiview/euclidean_resection.h
branches/soc-2013-cycles_volume/extern/libmv/libmv/tracking/track_region.cc
branches/soc-2013-cycles_volume/extern/libmv/libmv-capi.cc
branches/soc-2013-cycles_volume/extern/libmv/libmv-capi.h
branches/soc-2013-cycles_volume/extern/libmv/libmv-capi_stub.cc
branches/soc-2013-cycles_volume/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/soc-2013-cycles_volume/intern/audaspace/OpenAL/AUD_OpenALDevice.h
branches/soc-2013-cycles_volume/intern/audaspace/Python/AUD_PyAPI.cpp
branches/soc-2013-cycles_volume/intern/audaspace/intern/AUD_IHandle.h
branches/soc-2013-cycles_volume/intern/audaspace/intern/AUD_SoftwareDevice.cpp
branches/soc-2013-cycles_volume/intern/audaspace/intern/AUD_SoftwareDevice.h
branches/soc-2013-cycles_volume/intern/audaspace/intern/AUD_Space.h
branches/soc-2013-cycles_volume/intern/cycles/CMakeLists.txt
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_object.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/blender/blender_sync.cpp
branches/soc-2013-cycles_volume/intern/cycles/bvh/bvh.h
branches/soc-2013-cycles_volume/intern/cycles/device/device_cuda.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_task.h
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.cl
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel.cu
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_accumulate.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_bvh.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_bvh_traversal.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_curve.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_displace.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_emission.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_light.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_object.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_passes.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_sse2.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_sse3.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_subsurface.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_closures.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_globals.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_services.h
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/node_light_path.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_texture.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_types.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_wave.h
branches/soc-2013-cycles_volume/intern/cycles/render/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/render/curves.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/film.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/graph.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/graph.h
branches/soc-2013-cycles_volume/intern/cycles/render/light.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/session.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/shader.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/shader.h
branches/soc-2013-cycles_volume/intern/cycles/render/svm.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/tile.cpp
branches/soc-2013-cycles_volume/intern/dualcon/dualcon.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/GeoCommon.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/MemoryAllocator.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/ModelReader.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/Projections.cpp
branches/soc-2013-cycles_volume/intern/dualcon/intern/Projections.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/Queue.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/cubes.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/dualcon_c_api.cpp
branches/soc-2013-cycles_volume/intern/dualcon/intern/manifold_table.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/marching_cubes_table.h
branches/soc-2013-cycles_volume/intern/dualcon/intern/octree.cpp
branches/soc-2013-cycles_volume/intern/dualcon/intern/octree.h
branches/soc-2013-cycles_volume/intern/ghost/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/ghost/GHOST_C-api.h
branches/soc-2013-cycles_volume/intern/ghost/GHOST_IWindow.h
branches/soc-2013-cycles_volume/intern/ghost/SConscript
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_C-api.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_Window.h
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowWin32.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowWin32.h
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowX11.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowX11.h
branches/soc-2013-cycles_volume/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-cycles_volume/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-cycles_volume/intern/mikktspace/mikktspace.c
branches/soc-2013-cycles_volume/intern/rigidbody/rb_bullet_api.cpp
branches/soc-2013-cycles_volume/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-cycles_volume/release/scripts/modules/bpy/path.py
branches/soc-2013-cycles_volume/release/scripts/modules/bpy_extras/image_utils.py
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/final.py
branches/soc-2013-cycles_volume/release/scripts/presets/cycles/sampling/preview.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_ui/properties_game.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_mask_common.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_object.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.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_view3d.py
branches/soc-2013-cycles_volume/release/scripts/startup/nodeitems_builtins.py
branches/soc-2013-cycles_volume/release/scripts/templates_py/custom_nodes.py
branches/soc-2013-cycles_volume/release/scripts/templates_py/script_stub.py
branches/soc-2013-cycles_volume/source/blender/avi/intern/avi.c
branches/soc-2013-cycles_volume/source/blender/avi/intern/avi_mjpeg.c
branches/soc-2013-cycles_volume/source/blender/blenfont/BLF_api.h
branches/soc-2013-cycles_volume/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_armature.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_blender.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_context.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_image.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mask.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_material.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_node.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_screen.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_sequencer.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_tracking.h
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/anim_sys.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/armature.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/blender.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/camera.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/constraint.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/context.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/curve.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/deform.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/dynamicpaint.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/fmodifier.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/image.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/image_gen.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/library.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mask.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/material.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/modifiers_bmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/movieclip.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/packedFile.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/particle.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pbvh_bmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/screen.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/shrinkwrap.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/sketch.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/sound.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/text.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_buffer.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_linklist.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_base.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_matrix.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_vector.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_memarena.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_mempool.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_string.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_utildefines.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/BLI_ghash.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_heap.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_kdtree.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_linklist.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/buffer.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/fileops.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_matrix.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/scanfill.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/smallhash.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/string.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/voronoi.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/runtime.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_volume/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/bmesh/bmesh.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_construct.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_construct.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_core.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_core.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_edgeloop.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_edgeloop.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_interp.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_marking.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_marking.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_mesh_conv.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_mods.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_opdefines.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_operators.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_operators_private.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_polygon.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_polygon.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_private.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_queries.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_structure.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_structure.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_connect.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_connect_pair.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_create.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_dissolve.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_dupe.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_edgenet.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_extrude.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_join_triangles.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_removedoubles.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_smooth_laplacian.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_split_edges.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_subdivide.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_subdivide_edgering.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_symmetrize.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_utils.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_wireframe.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_bevel.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_decimate_collapse.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_edgesplit.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_edgesplit.h
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_triangulate.c
branches/soc-2013-cycles_volume/source/blender/collada/ArmatureImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/DocumentImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/MeshImporter.cpp
branches/soc-2013-cycles_volume/source/blender/collada/SkinInfo.cpp
branches/soc-2013-cycles_volume/source/blender/collada/TransformReader.cpp
branches/soc-2013-cycles_volume/source/blender/collada/collada_internal.cpp
branches/soc-2013-cycles_volume/source/blender/collada/collada_internal.h
branches/soc-2013-cycles_volume/source/blender/collada/collada_utils.cpp
branches/soc-2013-cycles_volume/source/blender/collada/collada_utils.h
branches/soc-2013-cycles_volume/source/blender/compositor/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/compositor/COM_compositor.h
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_Converter.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionGroup.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_ExecutionSystemHelper.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_WorkScheduler.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_RenderLayersNode.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_SplitViewerNode.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ImageOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ImageOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MapUVOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_MultilayerImageOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ReadBufferOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ReadBufferOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ViewerOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ViewerOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_WriteBufferOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_WriteBufferOperation.h
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_markers.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/animation/keyframes_general.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_select.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_select.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_transform.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/pose_utils.c
branches/soc-2013-cycles_volume/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_anim_api.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_armature.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_transform.h
branches/soc-2013-cycles_volume/source/blender/editors/include/UI_interface.h
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_layout.c
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/resources.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_relationships.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_select.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_shapekey.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editface.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_rip.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_tools.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_utils.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_data.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_navmesh.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/mesh_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/meshtools.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_bake.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_group.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_hook.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_modifier.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_relations.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_vgroup.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/render/render_preview.c
branches/soc-2013-cycles_volume/source/blender/editors/render/render_shading.c
branches/soc-2013-cycles_volume/source/blender/editors/screen/area.c
branches/soc-2013-cycles_volume/source/blender/editors/screen/screen_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/screen/screen_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_ops.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_utils.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt_uv.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_graph_ops.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_utils.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_clip/tracking_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_file/file_panels.c
branches/soc-2013-cycles_volume/source/blender/editors/space_file/space_file.c
branches/soc-2013-cycles_volume/source/blender/editors/space_graph/graph_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_image/image_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_logic/logic_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_logic/logic_window.c
branches/soc-2013-cycles_volume/source/blender/editors/space_nla/nla_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/drawnode.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_add.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_buttons.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_relationships.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_toolbar.c
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_view.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_outliner/outliner_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_tools.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2013-cycles_volume/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-cycles_volume/source/blender/editors/space_sequencer/sequencer_buttons.c
branches/soc-2013-cycles_volume/source/blender/editors/space_time/space_time.c
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/drawvolume.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_buttons.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_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_toolbar.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.h
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/uvedit/uvedit_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/application/AppView.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/application/Controller.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/blender_interface/BlenderFileLoader.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/blender_interface/BlenderStyleModule.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/blender_interface/BlenderTextureManager.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/BBox.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/FastGrid.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/FitCurve.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/Grid.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/Noise.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/Polygon.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/SweepLine.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/VecMat.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/normal_cycle.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/image/GaussianFilter.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/image/Image.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/python/Interface0D/BPy_CurvePoint.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/python/Interface0D/BPy_SVertex.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/DrawingStyle.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/FrsMaterial.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/LineRep.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/Node.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/NodeCamera.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/scene_graph/NodeDrawingStyle.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/Module.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/Operators.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/Predicates0D.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/Stroke.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/StrokeRenderer.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/StrokeRep.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/StrokeRep.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/StrokeTesselator.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/StyleModule.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/BaseIterator.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/BaseObject.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/Exception.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/Id.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/Interpreter.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/ProgressBar.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/PseudoNoise.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/RandGen.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/RenderMonitor.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/TimeStamp.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/system/TimeUtils.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/BoxGrid.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/FEdgeXDetector.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/Functions1D.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/GridDensityProvider.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/Interface1D.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/OccluderSource.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/SphericalGrid.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/SteerableViewMap.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/SteerableViewMap.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewEdgeXBuilder.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMap.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMapBuilder.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMapIO.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMapIterators.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMapTesselator.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/winged_edge/WEdge.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/winged_edge/WFillGrid.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/winged_edge/WSFillGrid.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/winged_edge/WXEdge.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/winged_edge/WXEdgeBuilder.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/winged_edge/WingedEdgeBuilder.h
branches/soc-2013-cycles_volume/source/blender/gpu/GPU_buffers.h
branches/soc-2013-cycles_volume/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-cycles_volume/source/blender/gpu/intern/gpu_draw.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/thumbs.c
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_ID.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_actuator_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_dynamicpaint_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_image_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_mask_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_scene_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_sound_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_tracking_types.h
branches/soc-2013-cycles_volume/source/blender/makesrna/SConscript
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/SConscript
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_actuator.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_curve.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_dynamicpaint.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_gpencil.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_internal.h
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_mask.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_meta.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_object_api.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_object_force.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_bevel.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_boolean_util.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_cloth.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_decimate.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_edgesplit.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_laplaciansmooth.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_mirror.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_ocean.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_warp.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_weightvg_util.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_weightvgedit.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_weightvgproximity.c
branches/soc-2013-cycles_volume/source/blender/nodes/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/nodes/NOD_composite.h
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/nodes/node_composite_image.c
branches/soc-2013-cycles_volume/source/blender/nodes/intern/node_common.c
branches/soc-2013-cycles_volume/source/blender/nodes/intern/node_exec.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_light_path.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_math.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/soc-2013-cycles_volume/source/blender/nodes/texture/node_texture_tree.c
branches/soc-2013-cycles_volume/source/blender/nodes/texture/nodes/node_texture_output.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_ops.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_types_meshdata.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_utils.c
branches/soc-2013-cycles_volume/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_volume/source/blender/quicktime/apple/quicktime_export.c
branches/soc-2013-cycles_volume/source/blender/render/intern/include/zbuf.h
branches/soc-2013-cycles_volume/source/blender/render/intern/raytrace/rayobject_octree.cpp
branches/soc-2013-cycles_volume/source/blender/render/intern/source/bake.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/convertblender.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/envmap.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/initrender.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/multires_bake.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/occlusion.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/pipeline.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/pointdensity.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/rayshade.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/render_result.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/render_texture.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/shadbuf.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/strand.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/voxeldata.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/zbuf.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_subwindow.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/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/KX_BlenderCanvas.h
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/KX_BlenderGL.h
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_ActionActuator.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_ActionActuator.h
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_ArmatureConstraint.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_ArmatureObject.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_ArmatureObject.h
branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Canvas.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Canvas.h
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_Action.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_Action.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_ActionManager.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Camera.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Camera.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Dome.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_KetsjiEngine.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_KetsjiEngine.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Light.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Light.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_NavMeshObject.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_ObstacleSimulation.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_PolyProxy.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_SoundActuator.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_2DFilterManager.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_2DFilterManager.h
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_BucketManager.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_ICanvas.h
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageIM.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVA.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_StorageVBO.cpp
branches/soc-2013-cycles_volume/source/gameengine/SceneGraph/SG_Tree.cpp
branches/soc-2013-cycles_volume/source/gameengine/VideoTexture/BlendType.h
branches/soc-2013-cycles_volume/source/gameengine/VideoTexture/Exception.cpp
branches/soc-2013-cycles_volume/source/gameengine/VideoTexture/FilterSource.h
branches/soc-2013-cycles_volume/source/gameengine/VideoTexture/ImageMix.h
branches/soc-2013-cycles_volume/source/gameengine/VideoTexture/ImageRender.cpp
branches/soc-2013-cycles_volume/source/tools/check_style_c.py
Added Paths:
-----------
branches/soc-2013-cycles_volume/SConscript
branches/soc-2013-cycles_volume/bsdf_diffuse_ramp.cpp
branches/soc-2013-cycles_volume/bsdf_phong_ramp.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_blackbody.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_blackbody.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_vector_transform.h
branches/soc-2013-cycles_volume/intern/cycles/render/blackbody.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/blackbody.h
branches/soc-2013-cycles_volume/osl_bssrdf.cpp
branches/soc-2013-cycles_volume/osl_bssrdf.h
branches/soc-2013-cycles_volume/release/text/GPL3-license.txt
branches/soc-2013-cycles_volume/release/text/jemalloc-license.txt
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_alloca.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_connect_nonplanar.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_edgenet.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_edgenet.h
branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/nodes/COM_PlaneTrackDeformNode.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackCommonOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SplitOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SplitOperation.h
branches/soc-2013-cycles_volume/source/blender/nodes/composite/nodes/node_composite_planetrackdeform.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_blackbody.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_sepcombHSV.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_vectTransform.c
Removed Paths:
-------------
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SplitViewerOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_SplitViewerOperation.h
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ViewerBaseOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_ViewerBaseOperation.h
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-58632
+ /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
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-59218
Modified: branches/soc-2013-cycles_volume/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/CMakeLists.txt 2013-08-20 19:50:31 UTC (rev 59336)
+++ branches/soc-2013-cycles_volume/CMakeLists.txt 2013-08-20 20:05:47 UTC (rev 59337)
@@ -417,6 +417,10 @@
set(WITH_HEADLESS ON)
endif()
+if(NOT WITH_PYTHON)
+ set(WITH_CYCLES OFF)
+endif()
+
# enable boost for cycles, booleans, audaspace or i18n
# otherwise if the user disabled
if(NOT WITH_BOOST)
Added: branches/soc-2013-cycles_volume/SConscript
===================================================================
--- branches/soc-2013-cycles_volume/SConscript (rev 0)
+++ branches/soc-2013-cycles_volume/SConscript 2013-08-20 20:05:47 UTC (rev 59337)
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+#
+# ***** BEGIN GPL LICENSE BLOCK *****
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software Foundation,
+# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+#
+# The Original Code is Copyright (C) 2011, Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): Nathan Letwory.
+#
+# ***** END GPL LICENSE BLOCK *****
+
+Import('env')
+
+defs = []
+incs = []
+cxxflags = Split(env['CXXFLAGS'])
+
+sources = env.Glob('*.cpp')
+
+incs.extend('. .. ../svm ../../render ../../util ../../device'.split())
+incs.append(env['BF_OIIO_INC'])
+incs.append(env['BF_BOOST_INC'])
+incs.append(env['BF_OSL_INC'])
+incs.append(env['BF_OPENEXR_INC'].split())
+
+defs.append('CCL_NAMESPACE_BEGIN=namespace ccl {')
+defs.append('CCL_NAMESPACE_END=}')
+defs.append('WITH_OSL')
+
+if env['OURPLATFORM'] in ('win32-vc', 'win64-vc'):
+ cxxflags.append('-DBOOST_NO_RTTI -DBOOST_NO_TYPEID /fp:fast'.split())
+ incs.append(env['BF_PTHREADS_INC'])
+ defs.append('OSL_STATIC_LIBRARY')
+else:
+ cxxflags.append('-fno-rtti -DBOOST_NO_RTTI -DBOOST_NO_TYPEID -ffast-math'.split())
+
+env.BlenderLib ('cycles_kernel_osl', sources, incs, defs, libtype=['intern'], priority=[10], cxx_compileflags=cxxflags)
Added: branches/soc-2013-cycles_volume/bsdf_diffuse_ramp.cpp
===================================================================
--- branches/soc-2013-cycles_volume/bsdf_diffuse_ramp.cpp (rev 0)
+++ branches/soc-2013-cycles_volume/bsdf_diffuse_ramp.cpp 2013-08-20 20:05:47 UTC (rev 59337)
@@ -0,0 +1,115 @@
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <OpenImageIO/fmath.h>
+
+#include <OSL/genclosure.h>
+
+#include "osl_closures.h"
+
+#include "kernel_types.h"
+#include "kernel_montecarlo.h"
+#include "closure/bsdf_diffuse_ramp.h"
+
+CCL_NAMESPACE_BEGIN
+
+using namespace OSL;
+
+class DiffuseRampClosure : public CBSDFClosure {
+public:
+ DiffuseRampClosure() : CBSDFClosure(LABEL_DIFFUSE) {}
+ Color3 colors[8];
+ float3 fcolors[8];
+
+ size_t memsize() const { return sizeof(*this); }
+ const char *name() const { return "diffuse_ramp"; }
+
+ void setup()
+ {
+ sc.prim = this;
+ m_shaderdata_flag = bsdf_diffuse_ramp_setup(&sc);
+
+ for(int i = 0; i < 8; i++)
+ fcolors[i] = TO_FLOAT3(colors[i]);
+ }
+
+ bool mergeable(const ClosurePrimitive *other) const
+ {
+ return false;
+ }
+
+ void blur(float roughness)
+ {
+ bsdf_diffuse_ramp_blur(&sc, roughness);
+ }
+
+ void print_on(std::ostream &out) const
+ {
+ out << name() << " ((" << sc.N[0] << ", " << sc.N[1] << ", " << sc.N[2] << "))";
+ }
+
+ float3 eval_reflect(const float3 &omega_out, const float3 &omega_in, float& pdf) const
+ {
+ return bsdf_diffuse_ramp_eval_reflect(&sc, fcolors, omega_out, omega_in, &pdf);
+ }
+
+ float3 eval_transmit(const float3 &omega_out, const float3 &omega_in, float& pdf) const
+ {
+ return bsdf_diffuse_ramp_eval_transmit(&sc, fcolors, omega_out, omega_in, &pdf);
+ }
+
+ int sample(const float3 &Ng,
+ const float3 &omega_out, const float3 &domega_out_dx, const float3 &domega_out_dy,
+ float randu, float randv,
+ float3 &omega_in, float3 &domega_in_dx, float3 &domega_in_dy,
+ float &pdf, float3 &eval) const
+ {
+ return bsdf_diffuse_ramp_sample(&sc, fcolors, Ng, omega_out, domega_out_dx, domega_out_dy,
+ randu, randv, &eval, &omega_in, &domega_in_dx, &domega_in_dy, &pdf);
+ }
+};
+
+ClosureParam *closure_bsdf_diffuse_ramp_params()
+{
+ static ClosureParam params[] = {
+ CLOSURE_FLOAT3_PARAM(DiffuseRampClosure, sc.N),
+ CLOSURE_COLOR_ARRAY_PARAM(DiffuseRampClosure, colors, 8),
+ CLOSURE_STRING_KEYPARAM("label"),
+ CLOSURE_FINISH_PARAM(DiffuseRampClosure)
+ };
+ return params;
+}
+
+CLOSURE_PREPARE(closure_bsdf_diffuse_ramp_prepare, DiffuseRampClosure)
+
+CCL_NAMESPACE_END
+
Added: branches/soc-2013-cycles_volume/bsdf_phong_ramp.cpp
===================================================================
--- branches/soc-2013-cycles_volume/bsdf_phong_ramp.cpp (rev 0)
+++ branches/soc-2013-cycles_volume/bsdf_phong_ramp.cpp 2013-08-20 20:05:47 UTC (rev 59337)
@@ -0,0 +1,115 @@
+/*
+ * Adapted from Open Shading Language with this license:
+ *
+ * Copyright (c) 2009-2010 Sony Pictures Imageworks Inc., et al.
+ * All Rights Reserved.
+ *
+ * Modifications Copyright 2011, Blender Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of Sony Pictures Imageworks nor the names of its
+ * contributors may be used to endorse or promote products derived from
+ * this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list