[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59738] branches/soc-2013-cycles_volume: - merged from trunk, up to r59732; - resolved conflict in CMake files from Cycles Standalone changes;
Rafael Campos
rafaelcdn at gmail.com
Mon Sep 2 16:55:03 CEST 2013
Revision: 59738
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59738
Author: jehuty
Date: 2013-09-02 14:55:02 +0000 (Mon, 02 Sep 2013)
Log Message:
-----------
- merged from trunk, up to r59732; - resolved conflict in CMake files from Cycles Standalone changes;
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59732
Modified Paths:
--------------
branches/soc-2013-cycles_volume/CMakeLists.txt
branches/soc-2013-cycles_volume/GNUmakefile
branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh
branches/soc-2013-cycles_volume/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake
branches/soc-2013-cycles_volume/extern/recastnavigation/recast-capi.cpp
branches/soc-2013-cycles_volume/extern/recastnavigation/recast-capi.h
branches/soc-2013-cycles_volume/intern/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/SConscript
branches/soc-2013-cycles_volume/intern/cycles/app/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/app/cycles_server.cpp
branches/soc-2013-cycles_volume/intern/cycles/app/cycles_xml.cpp
branches/soc-2013-cycles_volume/intern/cycles/app/cycles_xml.h
branches/soc-2013-cycles_volume/intern/cycles/app/io_export_cycles_xml.py
branches/soc-2013-cycles_volume/intern/cycles/blender/CCL_api.h
branches/soc-2013-cycles_volume/intern/cycles/blender/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/__init__.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/engine.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/osl.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/presets.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/properties.py
branches/soc-2013-cycles_volume/intern/cycles/blender/addon/ui.py
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_camera.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_curves.cpp
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_particles.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_python.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_session.cpp
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_session.h
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/blender/blender_sync.h
branches/soc-2013-cycles_volume/intern/cycles/blender/blender_util.h
branches/soc-2013-cycles_volume/intern/cycles/bvh/bvh.cpp
branches/soc-2013-cycles_volume/intern/cycles/cmake/external_libs.cmake
branches/soc-2013-cycles_volume/intern/cycles/device/device.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device.h
branches/soc-2013-cycles_volume/intern/cycles/device/device_cpu.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_cuda.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_intern.h
branches/soc-2013-cycles_volume/intern/cycles/device/device_memory.h
branches/soc-2013-cycles_volume/intern/cycles/device/device_multi.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_network.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_network.h
branches/soc-2013-cycles_volume/intern/cycles/device/device_opencl.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_task.cpp
branches/soc-2013-cycles_volume/intern/cycles/device/device_task.h
branches/soc-2013-cycles_volume/intern/cycles/doc/license/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/doc/license/readme.txt
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/closure/bsdf_microfacet.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/closure/bsdf_oren_nayar.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/closure/bssrdf.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/closure/volume.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.h
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_camera.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_compat_cpu.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_compat_cuda.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_compat_opencl.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_curve.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_differential.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_film.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_globals.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_jitter.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_light.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_math.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_montecarlo.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_primitive.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_random.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_textures.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_triangle.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_types.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_bssrdf.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_bssrdf.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/osl/osl_closures.cpp
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/osl/osl_shader.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_add_closure.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_attribute.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_background.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_blackbody.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_brick_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_brightness.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_bump.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_camera.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_checker_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_color.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_combine_hsv.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_combine_rgb.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_color.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_float.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_int.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_normal.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_point.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_string.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_convert_from_vector.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_emission.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_environment_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_fresnel.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_fresnel.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_gamma.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_geometry.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_glass_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_gradient_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_hair_info.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_holdout.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_hsv.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_image_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_invert.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_layer_weight.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_light_falloff.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_light_path.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_magic_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_mapping.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_math.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_mix.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_mix_closure.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_musgrave_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_noise_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_normal.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_normal_map.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_object_info.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_output_displacement.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_output_surface.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_output_volume.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_particle_info.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_rgb_curves.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_rgb_ramp.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_separate_hsv.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_separate_rgb.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_set_normal.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_sky_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_tangent.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_texture.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_texture_coordinate.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_toon_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_value.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_vector_curves.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_vector_math.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_vector_transform.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_voronoi_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_ward_bsdf.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_wave_texture.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_wavelength.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/node_wireframe.osl
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/oslutil.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/shaders/stdosl.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_attribute.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_brick.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_brightness.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_camera.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_checker.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_closure.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_convert.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_displace.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_fresnel.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_gamma.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_geometry.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_gradient.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_hsv.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_image.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_invert.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_light_path.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_magic.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_mapping.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_math.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_mix.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_musgrave.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_noisetex.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_normal.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_ramp.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_sky.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_tex_coord.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_value.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_vector_transform.h
branches/soc-2013-cycles_volume/intern/cycles/kernel/svm/svm_voronoi.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/attribute.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/attribute.h
branches/soc-2013-cycles_volume/intern/cycles/render/background.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/background.h
branches/soc-2013-cycles_volume/intern/cycles/render/blackbody.h
branches/soc-2013-cycles_volume/intern/cycles/render/bssrdf.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/bssrdf.h
branches/soc-2013-cycles_volume/intern/cycles/render/buffers.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/buffers.h
branches/soc-2013-cycles_volume/intern/cycles/render/camera.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/camera.h
branches/soc-2013-cycles_volume/intern/cycles/render/curves.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/curves.h
branches/soc-2013-cycles_volume/intern/cycles/render/film.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/film.h
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/image.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/image.h
branches/soc-2013-cycles_volume/intern/cycles/render/integrator.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/integrator.h
branches/soc-2013-cycles_volume/intern/cycles/render/light.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/light.h
branches/soc-2013-cycles_volume/intern/cycles/render/mesh.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/mesh.h
branches/soc-2013-cycles_volume/intern/cycles/render/mesh_displace.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/object.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/object.h
branches/soc-2013-cycles_volume/intern/cycles/render/osl.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/osl.h
branches/soc-2013-cycles_volume/intern/cycles/render/particles.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/particles.h
branches/soc-2013-cycles_volume/intern/cycles/render/scene.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/scene.h
branches/soc-2013-cycles_volume/intern/cycles/render/session.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/session.h
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/sobol.h
branches/soc-2013-cycles_volume/intern/cycles/render/svm.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/svm.h
branches/soc-2013-cycles_volume/intern/cycles/render/tables.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/tables.h
branches/soc-2013-cycles_volume/intern/cycles/render/tile.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/tile.h
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_build.h
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_dice.cpp
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_dice.h
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_patch.cpp
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_patch.h
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_split.cpp
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_split.h
branches/soc-2013-cycles_volume/intern/cycles/subd/subd_stencil.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/cycles/util/util_algorithm.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_args.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_boundbox.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_cache.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_cache.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_color.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_cuda.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_cuda.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_debug.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_dynlib.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_dynlib.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_foreach.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_function.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_hash.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_image.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_list.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_map.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_math.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_opengl.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_param.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_path.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_path.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_progress.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_set.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_stats.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_string.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_string.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_system.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_system.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_task.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_task.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_thread.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_time.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_time.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_transform.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_transform.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_types.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_vector.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_view.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_view.h
branches/soc-2013-cycles_volume/intern/cycles/util/util_xml.h
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_DisplayManagerSDL.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_SystemWin32.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowSDL.cpp
branches/soc-2013-cycles_volume/intern/ghost/intern/GHOST_WindowSDL.h
branches/soc-2013-cycles_volume/intern/guardedalloc/CMakeLists.txt
branches/soc-2013-cycles_volume/intern/guardedalloc/MEM_guardedalloc.h
branches/soc-2013-cycles_volume/intern/guardedalloc/SConscript
branches/soc-2013-cycles_volume/intern/guardedalloc/intern/mallocn.c
branches/soc-2013-cycles_volume/intern/guardedalloc/intern/mmap_win.c
branches/soc-2013-cycles_volume/intern/guardedalloc/mmap_win.h
branches/soc-2013-cycles_volume/intern/opencolorio/fallback_impl.cc
branches/soc-2013-cycles_volume/intern/opencolorio/ocio_capi.cc
branches/soc-2013-cycles_volume/intern/opencolorio/ocio_capi.h
branches/soc-2013-cycles_volume/intern/opencolorio/ocio_impl.cc
branches/soc-2013-cycles_volume/intern/opencolorio/ocio_impl.h
branches/soc-2013-cycles_volume/intern/opencolorio/ocio_impl_glsl.cc
branches/soc-2013-cycles_volume/intern/tools/bpy_introspect_ui.py
branches/soc-2013-cycles_volume/release/datafiles/blender_icons.sh
branches/soc-2013-cycles_volume/release/datafiles/blender_icons.svg
branches/soc-2013-cycles_volume/release/datafiles/blender_icons16.png
branches/soc-2013-cycles_volume/release/datafiles/blender_icons32.png
branches/soc-2013-cycles_volume/release/datafiles/prvicons.png
branches/soc-2013-cycles_volume/release/datafiles/prvicons.sh
branches/soc-2013-cycles_volume/release/datafiles/prvicons.svg
branches/soc-2013-cycles_volume/release/scripts/freestyle/style_modules/parameter_editor.py
branches/soc-2013-cycles_volume/release/scripts/modules/addon_utils.py
branches/soc-2013-cycles_volume/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
branches/soc-2013-cycles_volume/release/scripts/modules/bl_i18n_utils/settings.py
branches/soc-2013-cycles_volume/release/scripts/modules/bl_i18n_utils/utils.py
branches/soc-2013-cycles_volume/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2013-cycles_volume/release/scripts/modules/bpy_types.py
branches/soc-2013-cycles_volume/release/scripts/modules/rna_info.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/maya.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/__init__.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/wm.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/__init__.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_constraint.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_freestyle.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_material.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_particle.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_physics_common.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/properties_texture.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_image.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_node.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_outliner.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_sequencer.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_text.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_time.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_userpref.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2013-cycles_volume/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2013-cycles_volume/release/scripts/templates_py/ui_list.py
branches/soc-2013-cycles_volume/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-cycles_volume/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-cycles_volume/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_DerivedMesh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_anim.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_armature.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_cloth.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_curve.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_displist.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_editmesh_bvh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_idprop.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_key.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_lamp.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_lattice.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_library.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mball.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_modifier.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_node.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_object.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_particle.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_pbvh.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_report.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_text.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/blenkernel/SConscript
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/anim.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/boids.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/brush.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/cloth.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/collision.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/depsgraph.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/displist.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/editmesh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/editmesh_bvh.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/effect.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/font.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/group.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/image.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/key.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/lattice.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mask_rasterize.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/material.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/mball.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/modifier.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/modifiers_bmesh.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/object_deform.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/particle.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/particle_system.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/pbvh_intern.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/pointcache.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/property.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/sca.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/screen.c
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/sequencer.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_callbacks.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_dynstr.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_edgehash.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_endian_switch.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_fileops.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_fnmatch.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_ghash.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_jitter.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_kdtree.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_lasso.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_linklist_stack.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_listbase.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_geom.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_interp.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_math_rotation.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_path_util.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_scanfill.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_smallhash.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_string.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_string_utf8.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_threads.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_utildefines.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_winstuff.h
branches/soc-2013-cycles_volume/source/blender/blenlib/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/blenlib/PIL_time.h
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_memarena.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/BLI_mempool.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/boxpack2d.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/edgehash.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/fileops.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/gsqueue.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/lasso.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/listbase.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_base_inline.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_geom.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_geom_inline.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_rotation.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/math_vector_inline.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/path_util.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/quadric.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/rand.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/storage.c
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/threads.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/readblenentry.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/readfile.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/undofile.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/versioning_legacy.c
branches/soc-2013-cycles_volume/source/blender/blenloader/intern/writefile.c
branches/soc-2013-cycles_volume/source/blender/bmesh/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/bmesh/bmesh.h
branches/soc-2013-cycles_volume/source/blender/bmesh/bmesh_class.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_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_inline.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_iterators.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_log.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_log.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_mesh.c
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_operator_api.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_operator_api_inline.h
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_queries.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_queries.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_walkers.c
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_walkers.h
branches/soc-2013-cycles_volume/source/blender/bmesh/intern/bmesh_walkers_impl.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_beautify.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_bevel.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_bridge.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_edgeloop.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_fill_grid.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_fill_holes.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_hull.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_inset.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_poke.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_primitive.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_removedoubles.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_triangulate.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_unsubdivide.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_unsubdivide.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/bmesh/tools/bmesh_edgesplit.c
branches/soc-2013-cycles_volume/source/blender/collada/collada.cpp
branches/soc-2013-cycles_volume/source/blender/collada/collada_utils.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/intern/COM_MemoryBuffer.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackMaskOperation.cpp
branches/soc-2013-cycles_volume/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
branches/soc-2013-cycles_volume/source/blender/editors/animation/anim_filter.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/armature_skinning.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/meshlaplacian.c
branches/soc-2013-cycles_volume/source/blender/editors/armature/reeb.c
branches/soc-2013-cycles_volume/source/blender/editors/curve/curve_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/curve/curve_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/curve/editcurve.c
branches/soc-2013-cycles_volume/source/blender/editors/datafiles/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/editors/gpencil/gpencil_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_curve.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_mask.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_object.h
branches/soc-2013-cycles_volume/source/blender/editors/include/ED_uvedit.h
branches/soc-2013-cycles_volume/source/blender/editors/include/UI_icons.h
branches/soc-2013-cycles_volume/source/blender/editors/include/UI_interface.h
branches/soc-2013-cycles_volume/source/blender/editors/include/UI_view2d.h
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_handlers.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_layout.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_regions.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_templates.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/view2d.c
branches/soc-2013-cycles_volume/source/blender/editors/interface/view2d_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/io/io_collada.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_add.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/mask/mask_intern.h
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/mesh/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_inset.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_path.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_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/metaball/mball_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_add.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_modifier.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_relations.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_transform.c
branches/soc-2013-cycles_volume/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_volume/source/blender/editors/physics/particle_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/render/render_internal.c
branches/soc-2013-cycles_volume/source/blender/editors/render/render_preview.c
branches/soc-2013-cycles_volume/source/blender/editors/screen/glutil.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_hide.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2013-cycles_volume/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2013-cycles_volume/source/blender/editors/space_buttons/buttons_texture.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_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-cycles_volume/source/blender/editors/space_file/filelist.c
branches/soc-2013-cycles_volume/source/blender/editors/space_file/filesel.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_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_graph/graph_select.c
branches/soc-2013-cycles_volume/source/blender/editors/space_image/image_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_image/space_image.c
branches/soc-2013-cycles_volume/source/blender/editors/space_info/info_stats.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_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/space_node/node_ops.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_view.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_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_text/text_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_text/text_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/space_text/text_ops.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/view3d_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_intern.h
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_iterators.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_ops.c
branches/soc-2013-cycles_volume/source/blender/editors/space_view3d/view3d_project.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_constraints.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_conversions.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_generics.c
branches/soc-2013-cycles_volume/source/blender/editors/transform/transform_snap.c
branches/soc-2013-cycles_volume/source/blender/editors/util/crazyspace.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-cycles_volume/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/application/Controller.cpp
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/application/Controller.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/geometry/BBox.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/stroke/StrokeShader.h
branches/soc-2013-cycles_volume/source/blender/freestyle/intern/view_map/ViewMapAdvancedIterators.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_codegen.c
branches/soc-2013-cycles_volume/source/blender/imbuf/IMB_colormanagement.h
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/IMB_colormanagement_intern.h
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/colormanagement.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/imageprocess.c
branches/soc-2013-cycles_volume/source/blender/imbuf/intern/jpeg.c
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_curve_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_ipo_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_key_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_lattice_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_meta_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_modifier_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_node_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_object_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_particle_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_screen_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/DNA_space_types.h
branches/soc-2013-cycles_volume/source/blender/makesdna/intern/CMakeLists.txt
branches/soc-2013-cycles_volume/source/blender/makesdna/intern/SConscript
branches/soc-2013-cycles_volume/source/blender/makesdna/intern/dna_genfile.c
branches/soc-2013-cycles_volume/source/blender/makesrna/RNA_access.h
branches/soc-2013-cycles_volume/source/blender/makesrna/RNA_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/makesrna.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_color.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_define.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_lamp.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_main_api.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_modifier.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_object.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_render.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_rna.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_scene.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_sequencer.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_space.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_tracking.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_ui.c
branches/soc-2013-cycles_volume/source/blender/makesrna/intern/rna_ui_api.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_array.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_boolean_util.h
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_explode.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_particleinstance.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_skin.c
branches/soc-2013-cycles_volume/source/blender/modifiers/intern/MOD_triangulate.c
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/NOD_texture.h
branches/soc-2013-cycles_volume/source/blender/nodes/shader/node_shader_tree.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
branches/soc-2013-cycles_volume/source/blender/nodes/shader/nodes/node_shader_tex_sky.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_ops_call.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_types.c
branches/soc-2013-cycles_volume/source/blender/python/bmesh/bmesh_py_types_customdata.c
branches/soc-2013-cycles_volume/source/blender/python/intern/bpy_app_handlers.c
branches/soc-2013-cycles_volume/source/blender/python/intern/bpy_rna.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_Vector.c
branches/soc-2013-cycles_volume/source/blender/python/mathutils/mathutils_geometry.c
branches/soc-2013-cycles_volume/source/blender/render/intern/source/convertblender.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/zbuf.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/WM_api.h
branches/soc-2013-cycles_volume/source/blender/windowmanager/WM_types.h
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_cursors.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_event_system.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_files.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_init_exit.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_jobs.c
branches/soc-2013-cycles_volume/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-cycles_volume/source/blenderplayer/bad_level_call_stubs/stubs.c
branches/soc-2013-cycles_volume/source/creator/creator.c
branches/soc-2013-cycles_volume/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/soc-2013-cycles_volume/source/gameengine/Converter/BL_ShapeDeformer.cpp
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/Joystick/SCA_Joystick.cpp
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/Joystick/SCA_JoystickEvents.cpp
branches/soc-2013-cycles_volume/source/gameengine/GameLogic/SCA_IScene.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/soc-2013-cycles_volume/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_ActionManager.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_RaySensor.h
branches/soc-2013-cycles_volume/source/gameengine/Ketsji/KX_Scene.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_MeshObject.cpp
branches/soc-2013-cycles_volume/source/gameengine/Rasterizer/RAS_MeshObject.h
Added Paths:
-----------
branches/soc-2013-cycles_volume/doc/python_api/examples/bpy.types.UIList.1.py
branches/soc-2013-cycles_volume/doc/python_api/examples/bpy.types.UIList.2.py
branches/soc-2013-cycles_volume/intern/atomic/
branches/soc-2013-cycles_volume/intern/atomic/atomic_ops.h
branches/soc-2013-cycles_volume/intern/cycles/app/cycles_standalone.cpp
branches/soc-2013-cycles_volume/intern/cycles/kernel/kernel_bvh_subsurface.h
branches/soc-2013-cycles_volume/intern/cycles/render/sky_model.cpp
branches/soc-2013-cycles_volume/intern/cycles/render/sky_model.h
branches/soc-2013-cycles_volume/intern/cycles/render/sky_model_data.h
branches/soc-2013-cycles_volume/release/scripts/startup/bl_operators/mask.py
branches/soc-2013-cycles_volume/release/scripts/templates_py/ui_list_simple.py
branches/soc-2013-cycles_volume/source/blender/blenkernel/BKE_treehash.h
branches/soc-2013-cycles_volume/source/blender/blenkernel/intern/treehash.c
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_compiler_attrs.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_sort.h
branches/soc-2013-cycles_volume/source/blender/blenlib/BLI_strict_flags.h
branches/soc-2013-cycles_volume/source/blender/blenlib/intern/sort.c
branches/soc-2013-cycles_volume/source/blender/bmesh/bmesh_tools.h
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_bisect_plane.c
branches/soc-2013-cycles_volume/source/blender/bmesh/operators/bmo_fill_attribute.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_bisect_plane.c
branches/soc-2013-cycles_volume/source/blender/bmesh/tools/bmesh_bisect_plane.h
branches/soc-2013-cycles_volume/source/blender/editors/mesh/editmesh_bisect.c
Removed Paths:
-------------
branches/soc-2013-cycles_volume/doc/python_api/examples/bpy.types.UIList.py
branches/soc-2013-cycles_volume/intern/atomic/atomic_ops.h
branches/soc-2013-cycles_volume/intern/cycles/app/cycles_test.cpp
branches/soc-2013-cycles_volume/intern/cycles/doc/license/Blender.txt
branches/soc-2013-cycles_volume/intern/cycles/doc/license/GPL.txt
branches/soc-2013-cycles_volume/intern/cycles/util/util_memarena.cpp
branches/soc-2013-cycles_volume/intern/cycles/util/util_memarena.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,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
+ /branches/ge_dev:58091-58422
/branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573,58822,58989
/branches/soc-2013-depsgraph_mt:57516,57900,57939-57940,57945,57958-57961,58151,58155-58156,58169,58277-58279,58282-58283,58711,58787,58789,58796,59086-59087,59163,59166,59170,59181,59259-59260
/branches/soc-2013-dingto:57424,57487,57507,57525,57599,57670,57918-57919,57981,58091,58245,58253,58587,58772,58774-58775,58828,58835,59032,59214,59220,59251,59601
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57393-59732
Modified: branches/soc-2013-cycles_volume/CMakeLists.txt
===================================================================
--- branches/soc-2013-cycles_volume/CMakeLists.txt 2013-09-02 14:23:42 UTC (rev 59737)
+++ branches/soc-2013-cycles_volume/CMakeLists.txt 2013-09-02 14:55:02 UTC (rev 59738)
@@ -261,7 +261,8 @@
# Cycles
option(WITH_CYCLES "Enable cycles Render Engine" ON)
-option(WITH_CYCLES_TEST "Build cycles test application" OFF)
+option(WITH_CYCLES_STANDALONE "Build cycles standalone application" OFF)
+option(WITH_CYCLES_STANDALONE_GUI "Build cycles standalone with GUI" OFF)
option(WITH_CYCLES_OSL "Build Cycles with OSL support" OFF)
option(WITH_CYCLES_OPENVDB "Build Cycles with OpenVDB support (http://www.openvdb.org)" ON)
option(WITH_CYCLES_CUDA_BINARIES "Build cycles CUDA binaries" OFF)
@@ -374,7 +375,7 @@
#-----------------------------------------------------------------------------
# Check for conflicting/unsupported configurations
-if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_TEST)
+if(NOT WITH_BLENDER AND NOT WITH_PLAYER AND NOT WITH_CYCLES_STANDALONE)
message(FATAL_ERROR "At least one of WITH_BLENDER or WITH_PLAYER must be enabled, nothing to do!")
endif()
@@ -775,14 +776,14 @@
endif()
if(LLVM_DIRECTORY)
- FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+ find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION} HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
if(NOT LLVM_CONFIG)
- FIND_PROGRAM(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
+ find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_DIRECTORY}/bin NO_CMAKE_PATH)
endif()
else()
- FIND_PROGRAM(LLVM_CONFIG llvm-config-${LLVM_VERSION})
+ find_program(LLVM_CONFIG llvm-config-${LLVM_VERSION})
if(NOT LLVM_CONFIG)
- FIND_PROGRAM(LLVM_CONFIG llvm-config)
+ find_program(LLVM_CONFIG llvm-config)
endif()
endif()
execute_process(COMMAND ${LLVM_CONFIG} --version
@@ -893,8 +894,6 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(NOT WITH_PYTHON_MODULE)
- # BSD's dont use libdl.so
- set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -ldl")
# binreloc is linux only
set(BINRELOC_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/extern/binreloc/include)
set(WITH_BINRELOC ON)
@@ -2164,6 +2163,23 @@
set(CMAKE_C_FLAGS "${C_WARNINGS} ${CMAKE_C_FLAGS} ${PLATFORM_CFLAGS}")
set(CMAKE_CXX_FLAGS "${CXX_WARNINGS} ${CMAKE_CXX_FLAGS} ${PLATFORM_CFLAGS}")
+# defined above, platform spesific but shared names
+mark_as_advanced(
+ CYCLES_OSL
+ OSL_LIB_EXEC
+ OSL_COMPILER
+ OSL_LIB_COMP
+ OSL_LIB_QUERY
+ OSL_INCLUDES
+)
+
+mark_as_advanced(
+ LLVM_CONFIG
+ LLVM_DIRECTORY
+ LLVM_LIBRARY
+ LLVM_VERSION
+)
+
#-------------------------------------------------------------------------------
# Global Defines
Modified: branches/soc-2013-cycles_volume/GNUmakefile
===================================================================
--- branches/soc-2013-cycles_volume/GNUmakefile 2013-09-02 14:23:42 UTC (rev 59737)
+++ branches/soc-2013-cycles_volume/GNUmakefile 2013-09-02 14:55:02 UTC (rev 59738)
@@ -184,6 +184,7 @@
@echo " * check_spelling_py - check for spelling errors (Python only)"
@echo ""
@echo "Utilities (not associated with building blender)"
+ @echo " * icons - updates PNG icons from SVG files."
@echo " * tbz - create a compressed svn export 'blender_archive.tar.bz2'"
@echo ""
@echo "Documentation Targets (not associated with building blender)"
@@ -322,7 +323,11 @@
rm -rf blender_archive/
@echo "blender_archive.tar.bz2 written"
+icons:
+ $(BLENDER_DIR)/release/datafiles/blender_icons.sh
+ $(BLENDER_DIR)/release/datafiles/prvicons.sh
+
# -----------------------------------------------------------------------------
# Documentation
#
Modified: branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh
===================================================================
--- branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh 2013-09-02 14:23:42 UTC (rev 59737)
+++ branches/soc-2013-cycles_volume/build_files/build_environment/install_deps.sh 2013-09-02 14:55:02 UTC (rev 59738)
@@ -212,6 +212,7 @@
OPENEXR_FORCE_REBUILD=false
OPENEXR_SKIP=false
_with_built_openexr=false
+_need_openexr_ldconfig=false
OIIO_VERSION="1.1.10"
OIIO_SOURCE="https://github.com/OpenImageIO/oiio/archive/Release-$OIIO_VERSION.tar.gz"
@@ -230,6 +231,7 @@
# OSL needs to be compiled for now!
OSL_VERSION="1.3.2"
+OSL_VERSION_MIN=$OSL_VERSION
OSL_SOURCE="https://github.com/imageworks/OpenShadingLanguage/archive/Release-$OSL_VERSION.tar.gz"
OSL_FORCE_REBUILD=false
OSL_SKIP=false
@@ -2776,7 +2778,7 @@
if [ $? -eq 0 ]; then
install_packages_ARCH llvm clang
have_llvm=true
- LLVM_VERSION=`check_package_version_ge_ARCH llvm`
+ LLVM_VERSION=`check_package_version_ge_ARCH llvm $LLVM_VERSION_MIN`
LLVM_VERSION_FOUND=$LLVM_VERSION
clean_LLVM
else
Modified: branches/soc-2013-cycles_volume/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2013-cycles_volume/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-09-02 14:23:42 UTC (rev 59737)
+++ branches/soc-2013-cycles_volume/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2013-09-02 14:55:02 UTC (rev 59738)
@@ -199,4 +199,5 @@
PYTHON_INCLUDE_DIR
PYTHON_INCLUDE_CONFIG_DIR
PYTHON_LIBRARY
+ PYTHON_LIBPATH
)
Modified: branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake 2013-09-02 14:23:42 UTC (rev 59737)
+++ branches/soc-2013-cycles_volume/build_files/cmake/macros.cmake 2013-09-02 14:55:02 UTC (rev 59738)
@@ -392,7 +392,7 @@
target_link_libraries(${target} ${PTHREADS_LIBRARIES})
endif()
- target_link_libraries(${target} ${PLATFORM_LINKLIBS})
+ target_link_libraries(${target} ${PLATFORM_LINKLIBS} ${CMAKE_DL_LIBS})
endmacro()
macro(TEST_SSE_SUPPORT
@@ -804,4 +804,45 @@
unset(_file_from)
unset(_file_to)
unset(_file_to_path)
+
endmacro()
+
+# XXX Not used for now...
+macro(svg_to_png
+ file_from
+ file_to
+ dpi
+ list_to_add)
+
+ # remove ../'s
+ get_filename_component(_file_from ${CMAKE_CURRENT_SOURCE_DIR}/${file_from} REALPATH)
+ get_filename_component(_file_to ${CMAKE_CURRENT_SOURCE_DIR}/${file_to} REALPATH)
+
+ list(APPEND ${list_to_add} ${_file_to})
+
+ find_program(INKSCAPE_EXE inkscape)
+ mark_as_advanced(INKSCAPE_EXE)
+
+ if(INKSCAPE_EXE)
+ if(APPLE)
+ # in OS X app bundle, the binary is a shim that doesn't take any
+ # command line arguments, replace it with the actual binary
+ string(REPLACE "MacOS/Inkscape" "Resources/bin/inkscape" INKSCAPE_REAL_EXE ${INKSCAPE_EXE})
+ if(EXISTS "${INKSCAPE_REAL_EXE}")
+ set(INKSCAPE_EXE ${INKSCAPE_REAL_EXE})
+ endif()
+ endif()
+
+ add_custom_command(
+ OUTPUT ${_file_to}
+ COMMAND ${INKSCAPE_EXE} ${_file_from} --export-dpi=${dpi} --without-gui --export-png=${_file_to}
+ DEPENDS ${_file_from} ${INKSCAPE_EXE}
+ )
+ else()
+ message(WARNING "Inkscape not found, could not re-generate ${_file_to} from ${_file_from}!")
+ endif()
+
+ unset(_file_from)
+ unset(_file_to)
+
+endmacro()
Copied: branches/soc-2013-cycles_volume/doc/python_api/examples/bpy.types.UIList.1.py (from rev 59732, trunk/blender/doc/python_api/examples/bpy.types.UIList.1.py)
===================================================================
--- branches/soc-2013-cycles_volume/doc/python_api/examples/bpy.types.UIList.1.py (rev 0)
+++ branches/soc-2013-cycles_volume/doc/python_api/examples/bpy.types.UIList.1.py 2013-09-02 14:55:02 UTC (rev 59738)
@@ -0,0 +1,93 @@
+"""
+Basic UIList Example
++++++++++++++++++++
+This script is the UIList subclass used to show material slots, with a bunch of additional commentaries.
+
+Notice the name of the class, this naming convention is similar as the one for panels or menus.
+
+.. note::
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list