[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41717] branches/bmesh/blender: svn merge -r41655:41715 ^/trunk/ blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Campbell Barton
ideasman42 at gmail.com
Thu Nov 10 05:17:44 CET 2011
Revision: 41717
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41717
Author: campbellbarton
Date: 2011-11-10 04:17:43 +0000 (Thu, 10 Nov 2011)
Log Message:
-----------
svn merge -r41655:41715 ^/trunk/blender --- this is the real cycles merge, needs some edits to cycles its self before cycles will build
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41655
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/SConstruct
branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-i686.py
branches/bmesh/blender/build_files/buildbot/config/user-config-player-x86_64.py
branches/bmesh/blender/build_files/buildbot/config/user-config-x86_64.py
branches/bmesh/blender/build_files/cmake/cmake_consistency_check.py
branches/bmesh/blender/build_files/cmake/cmake_netbeans_project.py
branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
branches/bmesh/blender/build_files/cmake/macros.cmake
branches/bmesh/blender/build_files/scons/config/darwin-config.py
branches/bmesh/blender/build_files/scons/config/linux-config.py
branches/bmesh/blender/build_files/scons/config/win32-mingw-config.py
branches/bmesh/blender/build_files/scons/config/win32-vc-config.py
branches/bmesh/blender/build_files/scons/config/win64-vc-config.py
branches/bmesh/blender/build_files/scons/tools/Blender.py
branches/bmesh/blender/build_files/scons/tools/btools.py
branches/bmesh/blender/intern/CMakeLists.txt
branches/bmesh/blender/intern/SConscript
branches/bmesh/blender/intern/audaspace/CMakeLists.txt
branches/bmesh/blender/release/datafiles/fonts/droidsans.ttf.gz
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/presets.py
branches/bmesh/blender/source/blender/SConscript
branches/bmesh/blender/source/blender/blenfont/BLF_translation.h
branches/bmesh/blender/source/blender/blenfont/intern/blf_translation.c
branches/bmesh/blender/source/blender/blenkernel/BKE_blender.h
branches/bmesh/blender/source/blender/blenkernel/intern/tracking.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/editors/include/UI_interface.h
branches/bmesh/blender/source/blender/editors/interface/interface.c
branches/bmesh/blender/source/blender/editors/interface/interface_handlers.c
branches/bmesh/blender/source/blender/editors/interface/interface_intern.h
branches/bmesh/blender/source/blender/editors/interface/interface_layout.c
branches/bmesh/blender/source/blender/editors/interface/interface_panel.c
branches/bmesh/blender/source/blender/editors/interface/interface_templates.c
branches/bmesh/blender/source/blender/editors/interface/resources.c
branches/bmesh/blender/source/blender/editors/screen/screen_context.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/paint_vertex.c
branches/bmesh/blender/source/blender/editors/space_buttons/buttons_texture.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_graph_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/clip_ops.c
branches/bmesh/blender/source/blender/editors/space_clip/tracking_ops.c
branches/bmesh/blender/source/blender/editors/space_node/node_templates.c
branches/bmesh/blender/source/blender/editors/transform/transform_conversions.c
branches/bmesh/blender/source/blender/makesrna/RNA_access.h
branches/bmesh/blender/source/blender/makesrna/RNA_types.h
branches/bmesh/blender/source/blender/makesrna/SConscript
branches/bmesh/blender/source/blender/makesrna/intern/rna_access.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_define.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_movieclip.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_userdef.c
branches/bmesh/blender/source/blender/nodes/CMakeLists.txt
branches/bmesh/blender/source/blender/nodes/SConscript
branches/bmesh/blender/source/blender/nodes/composite/node_composite_tree.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_tree.c
branches/bmesh/blender/source/blender/nodes/texture/node_texture_tree.c
branches/bmesh/blender/source/blender/python/SConscript
branches/bmesh/blender/source/blender/python/intern/CMakeLists.txt
branches/bmesh/blender/source/blender/python/intern/bpy_interface.c
branches/bmesh/blender/source/blender/python/intern/bpy_rna.c
branches/bmesh/blender/source/creator/CMakeLists.txt
Added Paths:
-----------
branches/bmesh/blender/build_files/cmake/Modules/FindOpenImageIO.cmake
branches/bmesh/blender/intern/cycles/
branches/bmesh/blender/intern/cycles/CMakeLists.txt
branches/bmesh/blender/intern/cycles/SConscript
branches/bmesh/blender/intern/cycles/app/
branches/bmesh/blender/intern/cycles/app/CMakeLists.txt
branches/bmesh/blender/intern/cycles/app/cycles_server.cpp
branches/bmesh/blender/intern/cycles/app/cycles_test.cpp
branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp
branches/bmesh/blender/intern/cycles/app/cycles_xml.h
branches/bmesh/blender/intern/cycles/blender/
branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
branches/bmesh/blender/intern/cycles/blender/addon/
branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
branches/bmesh/blender/intern/cycles/blender/addon/engine.py
branches/bmesh/blender/intern/cycles/blender/addon/enums.py
branches/bmesh/blender/intern/cycles/blender/addon/presets.py
branches/bmesh/blender/intern/cycles/blender/addon/properties.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/addon/xml.py
branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp
branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
branches/bmesh/blender/intern/cycles/blender/blender_python.cpp
branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
branches/bmesh/blender/intern/cycles/blender/blender_session.h
branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.h
branches/bmesh/blender/intern/cycles/blender/blender_util.h
branches/bmesh/blender/intern/cycles/bvh/
branches/bmesh/blender/intern/cycles/bvh/CMakeLists.txt
branches/bmesh/blender/intern/cycles/bvh/bvh.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh.h
branches/bmesh/blender/intern/cycles/bvh/bvh_build.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh_build.h
branches/bmesh/blender/intern/cycles/bvh/bvh_node.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh_node.h
branches/bmesh/blender/intern/cycles/bvh/bvh_params.h
branches/bmesh/blender/intern/cycles/bvh/bvh_sort.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh_sort.h
branches/bmesh/blender/intern/cycles/cmake/
branches/bmesh/blender/intern/cycles/cmake/external_libs.cmake
branches/bmesh/blender/intern/cycles/device/
branches/bmesh/blender/intern/cycles/device/CMakeLists.txt
branches/bmesh/blender/intern/cycles/device/device.cpp
branches/bmesh/blender/intern/cycles/device/device.h
branches/bmesh/blender/intern/cycles/device/device_cpu.cpp
branches/bmesh/blender/intern/cycles/device/device_cuda.cpp
branches/bmesh/blender/intern/cycles/device/device_intern.h
branches/bmesh/blender/intern/cycles/device/device_memory.h
branches/bmesh/blender/intern/cycles/device/device_multi.cpp
branches/bmesh/blender/intern/cycles/device/device_network.cpp
branches/bmesh/blender/intern/cycles/device/device_network.h
branches/bmesh/blender/intern/cycles/device/device_opencl.cpp
branches/bmesh/blender/intern/cycles/doc/
branches/bmesh/blender/intern/cycles/doc/CMakeLists.txt
branches/bmesh/blender/intern/cycles/doc/license/
branches/bmesh/blender/intern/cycles/doc/license/Apache_2.0.txt
branches/bmesh/blender/intern/cycles/doc/license/Blender.txt
branches/bmesh/blender/intern/cycles/doc/license/Boost.txt
branches/bmesh/blender/intern/cycles/doc/license/CMakeLists.txt
branches/bmesh/blender/intern/cycles/doc/license/GPL.txt
branches/bmesh/blender/intern/cycles/doc/license/ILM.txt
branches/bmesh/blender/intern/cycles/doc/license/NVidia.txt
branches/bmesh/blender/intern/cycles/doc/license/OSL.txt
branches/bmesh/blender/intern/cycles/doc/license/Sobol.txt
branches/bmesh/blender/intern/cycles/doc/license/readme.txt
branches/bmesh/blender/intern/cycles/kernel/
branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/kernel.cl
branches/bmesh/blender/intern/cycles/kernel/kernel.cpp
branches/bmesh/blender/intern/cycles/kernel/kernel.cu
branches/bmesh/blender/intern/cycles/kernel/kernel.h
branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h
branches/bmesh/blender/intern/cycles/kernel/kernel_camera.h
branches/bmesh/blender/intern/cycles/kernel/kernel_compat_cpu.h
branches/bmesh/blender/intern/cycles/kernel/kernel_compat_cuda.h
branches/bmesh/blender/intern/cycles/kernel/kernel_compat_opencl.h
branches/bmesh/blender/intern/cycles/kernel/kernel_differential.h
branches/bmesh/blender/intern/cycles/kernel/kernel_displace.h
branches/bmesh/blender/intern/cycles/kernel/kernel_emission.h
branches/bmesh/blender/intern/cycles/kernel/kernel_film.h
branches/bmesh/blender/intern/cycles/kernel/kernel_globals.h
branches/bmesh/blender/intern/cycles/kernel/kernel_light.h
branches/bmesh/blender/intern/cycles/kernel/kernel_math.h
branches/bmesh/blender/intern/cycles/kernel/kernel_mbvh.h
branches/bmesh/blender/intern/cycles/kernel/kernel_montecarlo.h
branches/bmesh/blender/intern/cycles/kernel/kernel_object.h
branches/bmesh/blender/intern/cycles/kernel/kernel_path.h
branches/bmesh/blender/intern/cycles/kernel/kernel_qbvh.h
branches/bmesh/blender/intern/cycles/kernel/kernel_random.h
branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h
branches/bmesh/blender/intern/cycles/kernel/kernel_textures.h
branches/bmesh/blender/intern/cycles/kernel/kernel_triangle.h
branches/bmesh/blender/intern/cycles/kernel/kernel_types.h
branches/bmesh/blender/intern/cycles/kernel/osl/
branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/background.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bssrdf.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/debug.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/emissive.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_background.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_color.h
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_math.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_texture.h
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_value.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/stdosl.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_closures.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/osl_closures.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_globals.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_services.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/osl_services.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_shader.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/osl_shader.h
branches/bmesh/blender/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/bmesh/blender/intern/cycles/kernel/svm/
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_reflection.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_refraction.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_transparent.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_ward.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_westin.h
branches/bmesh/blender/intern/cycles/kernel/svm/emissive.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_attribute.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_bsdf.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_closure.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_convert.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_displace.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_fresnel.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_geometry.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_gradient.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_image.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_light_path.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_magic.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_mapping.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_math.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_mix.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_musgrave.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_noise.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_noisetex.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_sky.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_tex_coord.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_texture.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_value.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_voronoi.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_wave.h
branches/bmesh/blender/intern/cycles/kernel/svm/volume.h
branches/bmesh/blender/intern/cycles/render/
branches/bmesh/blender/intern/cycles/render/CMakeLists.txt
branches/bmesh/blender/intern/cycles/render/attribute.cpp
branches/bmesh/blender/intern/cycles/render/attribute.h
branches/bmesh/blender/intern/cycles/render/background.cpp
branches/bmesh/blender/intern/cycles/render/background.h
branches/bmesh/blender/intern/cycles/render/buffers.cpp
branches/bmesh/blender/intern/cycles/render/buffers.h
branches/bmesh/blender/intern/cycles/render/camera.cpp
branches/bmesh/blender/intern/cycles/render/camera.h
branches/bmesh/blender/intern/cycles/render/film.cpp
branches/bmesh/blender/intern/cycles/render/film.h
branches/bmesh/blender/intern/cycles/render/film_response.cpp
branches/bmesh/blender/intern/cycles/render/film_response.h
branches/bmesh/blender/intern/cycles/render/filter.cpp
branches/bmesh/blender/intern/cycles/render/filter.h
branches/bmesh/blender/intern/cycles/render/graph.cpp
branches/bmesh/blender/intern/cycles/render/graph.h
branches/bmesh/blender/intern/cycles/render/image.cpp
branches/bmesh/blender/intern/cycles/render/image.h
branches/bmesh/blender/intern/cycles/render/integrator.cpp
branches/bmesh/blender/intern/cycles/render/integrator.h
branches/bmesh/blender/intern/cycles/render/light.cpp
branches/bmesh/blender/intern/cycles/render/light.h
branches/bmesh/blender/intern/cycles/render/mesh.cpp
branches/bmesh/blender/intern/cycles/render/mesh.h
branches/bmesh/blender/intern/cycles/render/mesh_displace.cpp
branches/bmesh/blender/intern/cycles/render/nodes.cpp
branches/bmesh/blender/intern/cycles/render/nodes.h
branches/bmesh/blender/intern/cycles/render/object.cpp
branches/bmesh/blender/intern/cycles/render/object.h
branches/bmesh/blender/intern/cycles/render/osl.cpp
branches/bmesh/blender/intern/cycles/render/osl.h
branches/bmesh/blender/intern/cycles/render/scene.cpp
branches/bmesh/blender/intern/cycles/render/scene.h
branches/bmesh/blender/intern/cycles/render/session.cpp
branches/bmesh/blender/intern/cycles/render/session.h
branches/bmesh/blender/intern/cycles/render/shader.cpp
branches/bmesh/blender/intern/cycles/render/shader.h
branches/bmesh/blender/intern/cycles/render/sobol.cpp
branches/bmesh/blender/intern/cycles/render/sobol.h
branches/bmesh/blender/intern/cycles/render/svm.cpp
branches/bmesh/blender/intern/cycles/render/svm.h
branches/bmesh/blender/intern/cycles/render/tile.cpp
branches/bmesh/blender/intern/cycles/render/tile.h
branches/bmesh/blender/intern/cycles/subd/
branches/bmesh/blender/intern/cycles/subd/CMakeLists.txt
branches/bmesh/blender/intern/cycles/subd/subd_build.cpp
branches/bmesh/blender/intern/cycles/subd/subd_build.h
branches/bmesh/blender/intern/cycles/subd/subd_dice.cpp
branches/bmesh/blender/intern/cycles/subd/subd_dice.h
branches/bmesh/blender/intern/cycles/subd/subd_edge.h
branches/bmesh/blender/intern/cycles/subd/subd_face.h
branches/bmesh/blender/intern/cycles/subd/subd_mesh.cpp
branches/bmesh/blender/intern/cycles/subd/subd_mesh.h
branches/bmesh/blender/intern/cycles/subd/subd_patch.cpp
branches/bmesh/blender/intern/cycles/subd/subd_patch.h
branches/bmesh/blender/intern/cycles/subd/subd_ring.cpp
branches/bmesh/blender/intern/cycles/subd/subd_ring.h
branches/bmesh/blender/intern/cycles/subd/subd_split.cpp
branches/bmesh/blender/intern/cycles/subd/subd_split.h
branches/bmesh/blender/intern/cycles/subd/subd_stencil.cpp
branches/bmesh/blender/intern/cycles/subd/subd_stencil.h
branches/bmesh/blender/intern/cycles/subd/subd_vert.h
branches/bmesh/blender/intern/cycles/util/
branches/bmesh/blender/intern/cycles/util/CMakeLists.txt
branches/bmesh/blender/intern/cycles/util/util_algorithm.h
branches/bmesh/blender/intern/cycles/util/util_args.h
branches/bmesh/blender/intern/cycles/util/util_boundbox.h
branches/bmesh/blender/intern/cycles/util/util_cache.cpp
branches/bmesh/blender/intern/cycles/util/util_cache.h
branches/bmesh/blender/intern/cycles/util/util_color.h
branches/bmesh/blender/intern/cycles/util/util_cuda.cpp
branches/bmesh/blender/intern/cycles/util/util_cuda.h
branches/bmesh/blender/intern/cycles/util/util_debug.h
branches/bmesh/blender/intern/cycles/util/util_dynlib.cpp
branches/bmesh/blender/intern/cycles/util/util_dynlib.h
branches/bmesh/blender/intern/cycles/util/util_foreach.h
branches/bmesh/blender/intern/cycles/util/util_function.h
branches/bmesh/blender/intern/cycles/util/util_hash.h
branches/bmesh/blender/intern/cycles/util/util_image.h
branches/bmesh/blender/intern/cycles/util/util_list.h
branches/bmesh/blender/intern/cycles/util/util_map.h
branches/bmesh/blender/intern/cycles/util/util_math.h
branches/bmesh/blender/intern/cycles/util/util_md5.cpp
branches/bmesh/blender/intern/cycles/util/util_md5.h
branches/bmesh/blender/intern/cycles/util/util_memarena.cpp
branches/bmesh/blender/intern/cycles/util/util_memarena.h
branches/bmesh/blender/intern/cycles/util/util_opencl.c
branches/bmesh/blender/intern/cycles/util/util_opencl.h
branches/bmesh/blender/intern/cycles/util/util_opengl.h
branches/bmesh/blender/intern/cycles/util/util_param.h
branches/bmesh/blender/intern/cycles/util/util_path.cpp
branches/bmesh/blender/intern/cycles/util/util_path.h
branches/bmesh/blender/intern/cycles/util/util_progress.h
branches/bmesh/blender/intern/cycles/util/util_set.h
branches/bmesh/blender/intern/cycles/util/util_string.cpp
branches/bmesh/blender/intern/cycles/util/util_string.h
branches/bmesh/blender/intern/cycles/util/util_system.cpp
branches/bmesh/blender/intern/cycles/util/util_system.h
branches/bmesh/blender/intern/cycles/util/util_thread.h
branches/bmesh/blender/intern/cycles/util/util_time.cpp
branches/bmesh/blender/intern/cycles/util/util_time.h
branches/bmesh/blender/intern/cycles/util/util_transform.cpp
branches/bmesh/blender/intern/cycles/util/util_transform.h
branches/bmesh/blender/intern/cycles/util/util_types.h
branches/bmesh/blender/intern/cycles/util/util_vector.h
branches/bmesh/blender/intern/cycles/util/util_view.cpp
branches/bmesh/blender/intern/cycles/util/util_view.h
branches/bmesh/blender/intern/cycles/util/util_xml.h
branches/bmesh/blender/release/scripts/presets/cycles/
branches/bmesh/blender/release/scripts/presets/cycles/integrator/
branches/bmesh/blender/release/scripts/presets/cycles/integrator/direct_light.py
branches/bmesh/blender/release/scripts/presets/cycles/integrator/full_global_illumination.py
branches/bmesh/blender/release/scripts/presets/cycles/integrator/limited_global_illumination.py
Removed Paths:
-------------
branches/bmesh/blender/intern/cycles/CMakeLists.txt
branches/bmesh/blender/intern/cycles/SConscript
branches/bmesh/blender/intern/cycles/app/
branches/bmesh/blender/intern/cycles/app/CMakeLists.txt
branches/bmesh/blender/intern/cycles/app/cycles_server.cpp
branches/bmesh/blender/intern/cycles/app/cycles_test.cpp
branches/bmesh/blender/intern/cycles/app/cycles_xml.cpp
branches/bmesh/blender/intern/cycles/app/cycles_xml.h
branches/bmesh/blender/intern/cycles/blender/
branches/bmesh/blender/intern/cycles/blender/CMakeLists.txt
branches/bmesh/blender/intern/cycles/blender/addon/
branches/bmesh/blender/intern/cycles/blender/addon/__init__.py
branches/bmesh/blender/intern/cycles/blender/addon/engine.py
branches/bmesh/blender/intern/cycles/blender/addon/enums.py
branches/bmesh/blender/intern/cycles/blender/addon/presets.py
branches/bmesh/blender/intern/cycles/blender/addon/properties.py
branches/bmesh/blender/intern/cycles/blender/addon/ui.py
branches/bmesh/blender/intern/cycles/blender/addon/xml.py
branches/bmesh/blender/intern/cycles/blender/blender_camera.cpp
branches/bmesh/blender/intern/cycles/blender/blender_mesh.cpp
branches/bmesh/blender/intern/cycles/blender/blender_object.cpp
branches/bmesh/blender/intern/cycles/blender/blender_python.cpp
branches/bmesh/blender/intern/cycles/blender/blender_session.cpp
branches/bmesh/blender/intern/cycles/blender/blender_session.h
branches/bmesh/blender/intern/cycles/blender/blender_shader.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.cpp
branches/bmesh/blender/intern/cycles/blender/blender_sync.h
branches/bmesh/blender/intern/cycles/blender/blender_util.h
branches/bmesh/blender/intern/cycles/bvh/
branches/bmesh/blender/intern/cycles/bvh/CMakeLists.txt
branches/bmesh/blender/intern/cycles/bvh/bvh.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh.h
branches/bmesh/blender/intern/cycles/bvh/bvh_build.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh_build.h
branches/bmesh/blender/intern/cycles/bvh/bvh_node.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh_node.h
branches/bmesh/blender/intern/cycles/bvh/bvh_params.h
branches/bmesh/blender/intern/cycles/bvh/bvh_sort.cpp
branches/bmesh/blender/intern/cycles/bvh/bvh_sort.h
branches/bmesh/blender/intern/cycles/cmake/
branches/bmesh/blender/intern/cycles/cmake/external_libs.cmake
branches/bmesh/blender/intern/cycles/device/
branches/bmesh/blender/intern/cycles/device/CMakeLists.txt
branches/bmesh/blender/intern/cycles/device/device.cpp
branches/bmesh/blender/intern/cycles/device/device.h
branches/bmesh/blender/intern/cycles/device/device_cpu.cpp
branches/bmesh/blender/intern/cycles/device/device_cuda.cpp
branches/bmesh/blender/intern/cycles/device/device_intern.h
branches/bmesh/blender/intern/cycles/device/device_memory.h
branches/bmesh/blender/intern/cycles/device/device_multi.cpp
branches/bmesh/blender/intern/cycles/device/device_network.cpp
branches/bmesh/blender/intern/cycles/device/device_network.h
branches/bmesh/blender/intern/cycles/device/device_opencl.cpp
branches/bmesh/blender/intern/cycles/doc/
branches/bmesh/blender/intern/cycles/doc/CMakeLists.txt
branches/bmesh/blender/intern/cycles/doc/license/
branches/bmesh/blender/intern/cycles/doc/license/Apache_2.0.txt
branches/bmesh/blender/intern/cycles/doc/license/Blender.txt
branches/bmesh/blender/intern/cycles/doc/license/Boost.txt
branches/bmesh/blender/intern/cycles/doc/license/CMakeLists.txt
branches/bmesh/blender/intern/cycles/doc/license/GPL.txt
branches/bmesh/blender/intern/cycles/doc/license/ILM.txt
branches/bmesh/blender/intern/cycles/doc/license/NVidia.txt
branches/bmesh/blender/intern/cycles/doc/license/OSL.txt
branches/bmesh/blender/intern/cycles/doc/license/Sobol.txt
branches/bmesh/blender/intern/cycles/doc/license/readme.txt
branches/bmesh/blender/intern/cycles/kernel/
branches/bmesh/blender/intern/cycles/kernel/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/kernel.cl
branches/bmesh/blender/intern/cycles/kernel/kernel.cpp
branches/bmesh/blender/intern/cycles/kernel/kernel.cu
branches/bmesh/blender/intern/cycles/kernel/kernel.h
branches/bmesh/blender/intern/cycles/kernel/kernel_bvh.h
branches/bmesh/blender/intern/cycles/kernel/kernel_camera.h
branches/bmesh/blender/intern/cycles/kernel/kernel_compat_cpu.h
branches/bmesh/blender/intern/cycles/kernel/kernel_compat_cuda.h
branches/bmesh/blender/intern/cycles/kernel/kernel_compat_opencl.h
branches/bmesh/blender/intern/cycles/kernel/kernel_differential.h
branches/bmesh/blender/intern/cycles/kernel/kernel_displace.h
branches/bmesh/blender/intern/cycles/kernel/kernel_emission.h
branches/bmesh/blender/intern/cycles/kernel/kernel_film.h
branches/bmesh/blender/intern/cycles/kernel/kernel_globals.h
branches/bmesh/blender/intern/cycles/kernel/kernel_light.h
branches/bmesh/blender/intern/cycles/kernel/kernel_math.h
branches/bmesh/blender/intern/cycles/kernel/kernel_mbvh.h
branches/bmesh/blender/intern/cycles/kernel/kernel_montecarlo.h
branches/bmesh/blender/intern/cycles/kernel/kernel_object.h
branches/bmesh/blender/intern/cycles/kernel/kernel_path.h
branches/bmesh/blender/intern/cycles/kernel/kernel_qbvh.h
branches/bmesh/blender/intern/cycles/kernel/kernel_random.h
branches/bmesh/blender/intern/cycles/kernel/kernel_shader.h
branches/bmesh/blender/intern/cycles/kernel/kernel_textures.h
branches/bmesh/blender/intern/cycles/kernel/kernel_triangle.h
branches/bmesh/blender/intern/cycles/kernel/kernel_types.h
branches/bmesh/blender/intern/cycles/kernel/osl/
branches/bmesh/blender/intern/cycles/kernel/osl/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/background.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_ashikhmin_velvet.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_diffuse.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_microfacet.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_reflection.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_refraction.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_transparent.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_ward.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bsdf_westin.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/bssrdf.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/debug.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/emissive.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/CMakeLists.txt
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_add_closure.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_attribute.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_background.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_blend_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_blend_weight.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_bump.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_clouds_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_color.h
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_color.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_float.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_normal.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_point.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_convert_from_vector.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_diffuse_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_distorted_noise_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_emission.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_environment_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_fresnel.h
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_fresnel.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_geometry.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_glass_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_glossy_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_holdout.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_image_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_light_path.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_magic_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_mapping.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_marble_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_math.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_mix.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_mix_closure.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_noise_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_output_displacement.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_output_surface.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_output_volume.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_sky_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_stucci_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_texture.h
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_texture_coordinate.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_translucent_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_transparent_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_value.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_vector_math.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_velvet_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_voronoi_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_ward_bsdf.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/node_wood_texture.osl
branches/bmesh/blender/intern/cycles/kernel/osl/nodes/stdosl.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_closures.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/osl_closures.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_globals.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_services.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/osl_services.h
branches/bmesh/blender/intern/cycles/kernel/osl/osl_shader.cpp
branches/bmesh/blender/intern/cycles/kernel/osl/osl_shader.h
branches/bmesh/blender/intern/cycles/kernel/osl/vol_subsurface.cpp
branches/bmesh/blender/intern/cycles/kernel/svm/
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_ashikhmin_velvet.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_diffuse.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_microfacet.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_reflection.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_refraction.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_transparent.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_ward.h
branches/bmesh/blender/intern/cycles/kernel/svm/bsdf_westin.h
branches/bmesh/blender/intern/cycles/kernel/svm/emissive.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_attribute.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_bsdf.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_closure.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_convert.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_displace.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_fresnel.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_geometry.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_gradient.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_image.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_light_path.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_magic.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_mapping.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_math.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_mix.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_musgrave.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_noise.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_noisetex.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_sky.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_tex_coord.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_texture.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_types.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_value.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_voronoi.h
branches/bmesh/blender/intern/cycles/kernel/svm/svm_wave.h
branches/bmesh/blender/intern/cycles/kernel/svm/volume.h
branches/bmesh/blender/intern/cycles/render/
branches/bmesh/blender/intern/cycles/render/CMakeLists.txt
branches/bmesh/blender/intern/cycles/render/attribute.cpp
branches/bmesh/blender/intern/cycles/render/attribute.h
branches/bmesh/blender/intern/cycles/render/background.cpp
branches/bmesh/blender/intern/cycles/render/background.h
branches/bmesh/blender/intern/cycles/render/buffers.cpp
branches/bmesh/blender/intern/cycles/render/buffers.h
branches/bmesh/blender/intern/cycles/render/camera.cpp
branches/bmesh/blender/intern/cycles/render/camera.h
branches/bmesh/blender/intern/cycles/render/film.cpp
branches/bmesh/blender/intern/cycles/render/film.h
branches/bmesh/blender/intern/cycles/render/film_response.cpp
branches/bmesh/blender/intern/cycles/render/film_response.h
branches/bmesh/blender/intern/cycles/render/filter.cpp
branches/bmesh/blender/intern/cycles/render/filter.h
branches/bmesh/blender/intern/cycles/render/graph.cpp
branches/bmesh/blender/intern/cycles/render/graph.h
branches/bmesh/blender/intern/cycles/render/image.cpp
branches/bmesh/blender/intern/cycles/render/image.h
branches/bmesh/blender/intern/cycles/render/integrator.cpp
branches/bmesh/blender/intern/cycles/render/integrator.h
branches/bmesh/blender/intern/cycles/render/light.cpp
branches/bmesh/blender/intern/cycles/render/light.h
branches/bmesh/blender/intern/cycles/render/mesh.cpp
branches/bmesh/blender/intern/cycles/render/mesh.h
branches/bmesh/blender/intern/cycles/render/mesh_displace.cpp
branches/bmesh/blender/intern/cycles/render/nodes.cpp
branches/bmesh/blender/intern/cycles/render/nodes.h
branches/bmesh/blender/intern/cycles/render/object.cpp
branches/bmesh/blender/intern/cycles/render/object.h
branches/bmesh/blender/intern/cycles/render/osl.cpp
branches/bmesh/blender/intern/cycles/render/osl.h
branches/bmesh/blender/intern/cycles/render/scene.cpp
branches/bmesh/blender/intern/cycles/render/scene.h
branches/bmesh/blender/intern/cycles/render/session.cpp
branches/bmesh/blender/intern/cycles/render/session.h
branches/bmesh/blender/intern/cycles/render/shader.cpp
branches/bmesh/blender/intern/cycles/render/shader.h
branches/bmesh/blender/intern/cycles/render/sobol.cpp
branches/bmesh/blender/intern/cycles/render/sobol.h
branches/bmesh/blender/intern/cycles/render/svm.cpp
branches/bmesh/blender/intern/cycles/render/svm.h
branches/bmesh/blender/intern/cycles/render/tile.cpp
branches/bmesh/blender/intern/cycles/render/tile.h
branches/bmesh/blender/intern/cycles/subd/
branches/bmesh/blender/intern/cycles/subd/CMakeLists.txt
branches/bmesh/blender/intern/cycles/subd/subd_build.cpp
branches/bmesh/blender/intern/cycles/subd/subd_build.h
branches/bmesh/blender/intern/cycles/subd/subd_dice.cpp
branches/bmesh/blender/intern/cycles/subd/subd_dice.h
branches/bmesh/blender/intern/cycles/subd/subd_edge.h
branches/bmesh/blender/intern/cycles/subd/subd_face.h
branches/bmesh/blender/intern/cycles/subd/subd_mesh.cpp
branches/bmesh/blender/intern/cycles/subd/subd_mesh.h
branches/bmesh/blender/intern/cycles/subd/subd_patch.cpp
branches/bmesh/blender/intern/cycles/subd/subd_patch.h
branches/bmesh/blender/intern/cycles/subd/subd_ring.cpp
branches/bmesh/blender/intern/cycles/subd/subd_ring.h
branches/bmesh/blender/intern/cycles/subd/subd_split.cpp
branches/bmesh/blender/intern/cycles/subd/subd_split.h
branches/bmesh/blender/intern/cycles/subd/subd_stencil.cpp
branches/bmesh/blender/intern/cycles/subd/subd_stencil.h
branches/bmesh/blender/intern/cycles/subd/subd_vert.h
branches/bmesh/blender/intern/cycles/util/
branches/bmesh/blender/intern/cycles/util/CMakeLists.txt
branches/bmesh/blender/intern/cycles/util/util_algorithm.h
branches/bmesh/blender/intern/cycles/util/util_args.h
branches/bmesh/blender/intern/cycles/util/util_boundbox.h
branches/bmesh/blender/intern/cycles/util/util_cache.cpp
branches/bmesh/blender/intern/cycles/util/util_cache.h
branches/bmesh/blender/intern/cycles/util/util_color.h
branches/bmesh/blender/intern/cycles/util/util_cuda.cpp
branches/bmesh/blender/intern/cycles/util/util_cuda.h
branches/bmesh/blender/intern/cycles/util/util_debug.h
branches/bmesh/blender/intern/cycles/util/util_dynlib.cpp
branches/bmesh/blender/intern/cycles/util/util_dynlib.h
branches/bmesh/blender/intern/cycles/util/util_foreach.h
branches/bmesh/blender/intern/cycles/util/util_function.h
branches/bmesh/blender/intern/cycles/util/util_hash.h
branches/bmesh/blender/intern/cycles/util/util_image.h
branches/bmesh/blender/intern/cycles/util/util_list.h
branches/bmesh/blender/intern/cycles/util/util_map.h
branches/bmesh/blender/intern/cycles/util/util_math.h
branches/bmesh/blender/intern/cycles/util/util_md5.cpp
branches/bmesh/blender/intern/cycles/util/util_md5.h
branches/bmesh/blender/intern/cycles/util/util_memarena.cpp
branches/bmesh/blender/intern/cycles/util/util_memarena.h
branches/bmesh/blender/intern/cycles/util/util_opencl.c
branches/bmesh/blender/intern/cycles/util/util_opencl.h
branches/bmesh/blender/intern/cycles/util/util_opengl.h
branches/bmesh/blender/intern/cycles/util/util_param.h
branches/bmesh/blender/intern/cycles/util/util_path.cpp
branches/bmesh/blender/intern/cycles/util/util_path.h
branches/bmesh/blender/intern/cycles/util/util_progress.h
branches/bmesh/blender/intern/cycles/util/util_set.h
branches/bmesh/blender/intern/cycles/util/util_string.cpp
branches/bmesh/blender/intern/cycles/util/util_string.h
branches/bmesh/blender/intern/cycles/util/util_system.cpp
branches/bmesh/blender/intern/cycles/util/util_system.h
branches/bmesh/blender/intern/cycles/util/util_thread.h
branches/bmesh/blender/intern/cycles/util/util_time.cpp
branches/bmesh/blender/intern/cycles/util/util_time.h
branches/bmesh/blender/intern/cycles/util/util_transform.cpp
branches/bmesh/blender/intern/cycles/util/util_transform.h
branches/bmesh/blender/intern/cycles/util/util_types.h
branches/bmesh/blender/intern/cycles/util/util_vector.h
branches/bmesh/blender/intern/cycles/util/util_view.cpp
branches/bmesh/blender/intern/cycles/util/util_view.h
branches/bmesh/blender/intern/cycles/util/util_xml.h
branches/bmesh/blender/release/scripts/presets/cycles/integrator/
branches/bmesh/blender/release/scripts/presets/cycles/integrator/direct_light.py
branches/bmesh/blender/release/scripts/presets/cycles/integrator/full_global_illumination.py
branches/bmesh/blender/release/scripts/presets/cycles/integrator/limited_global_illumination.py
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41655
+ /trunk/blender:39992-41715
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-11-10 04:13:07 UTC (rev 41716)
+++ branches/bmesh/blender/CMakeLists.txt 2011-11-10 04:17:43 UTC (rev 41717)
@@ -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,12 @@
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)
+ mark_as_advanced(Boost_DIR) # why doesnt boost do this?
endif()
set(BOOST_INCLUDE_DIR ${Boost_INCLUDE_DIRS})
@@ -507,17 +517,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 +852,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 +951,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 +1489,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/bmesh/blender/SConstruct
===================================================================
--- branches/bmesh/blender/SConstruct 2011-11-10 04:13:07 UTC (rev 41716)
+++ branches/bmesh/blender/SConstruct 2011-11-10 04:17:43 UTC (rev 41717)
@@ -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)
Modified: branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py
===================================================================
--- branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py 2011-11-10 04:13:07 UTC (rev 41716)
+++ branches/bmesh/blender/build_files/buildbot/config/user-config-i686.py 2011-11-10 04:17:43 UTC (rev 41717)
@@ -34,7 +34,7 @@
# Don't depend on system's libstdc++
WITH_BF_STATICCXX = True
-BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.2/libstdc++.a'
+BF_CXX_LIB_STATIC = '/usr/lib/gcc/i486-linux-gnu/4.3.4/libstdc++.a'
WITH_BF_OPENAL = True
WITH_BF_STATICOPENAL = True
@@ -92,9 +92,24 @@
# JACK
WITH_BF_JACK = True
+# Cycles
+WITH_BF_CYCLES = True
+
+WITH_BF_OIIO = True
+WITH_BF_STATICOIIO = True
+BF_OIIO = '/opt/oiio'
+BF_OIIO_INC = '${BF_OIIO}/include'
+BF_OIIO_LIB_STATIC = '${BF_OIIO_LIBPATH}/libOpenImageIO.a ${BF_OPENEXR}/lib/libIlmImf.a'
+BF_OIIO_LIBPATH = '${BF_OIIO}/lib'
+
+WITH_BF_BOOST = True
+WITH_BF_STATICBOOST = True
+BF_BOOST = '/opt/boost'
+BF_BOOST_INC = '${BF_BOOST}/include'
+BF_BOOST_LIB_STATIC = '${BF_BOOST_LIBPATH}/libboost_filesystem.a ${BF_BOOST_LIBPATH}/libboost_date_time.a ${BF_BOOST_LIBPATH}/libboost_regex.a ${BF_BOOST_LIBPATH}/libboost_system.a ${BF_BOOST_LIBPATH}/libboost_thread.a'
+BF_BOOST_LIBPATH = '${BF_BOOST}/lib'
+
# Compilation and optimization
BF_DEBUG = False
-REL_CFLAGS = []
-REL_CXXFLAGS = []
-REL_CCFLAGS = ['-O2'] # C & C++
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list