[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59243] branches/soc-2013-paint: Merge -r59242 into soc-2013-paint

Antony Riakiotakis kalast at gmail.com
Sun Aug 18 18:15:31 CEST 2013


Revision: 59243
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59243
Author:   psy-fi
Date:     2013-08-18 16:15:30 +0000 (Sun, 18 Aug 2013)
Log Message:
-----------
Merge -r59242 into soc-2013-paint

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

Modified Paths:
--------------
    branches/soc-2013-paint/intern/cycles/app/cycles_server.cpp
    branches/soc-2013-paint/intern/cycles/app/cycles_test.cpp
    branches/soc-2013-paint/intern/cycles/app/cycles_xml.cpp
    branches/soc-2013-paint/intern/cycles/app/cycles_xml.h
    branches/soc-2013-paint/intern/cycles/app/io_export_cycles_xml.py
    branches/soc-2013-paint/intern/cycles/blender/CCL_api.h
    branches/soc-2013-paint/intern/cycles/blender/addon/__init__.py
    branches/soc-2013-paint/intern/cycles/blender/addon/engine.py
    branches/soc-2013-paint/intern/cycles/blender/addon/osl.py
    branches/soc-2013-paint/intern/cycles/blender/addon/presets.py
    branches/soc-2013-paint/intern/cycles/blender/addon/properties.py
    branches/soc-2013-paint/intern/cycles/blender/addon/ui.py
    branches/soc-2013-paint/intern/cycles/blender/blender_camera.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_curves.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_mesh.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_object.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_particles.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_python.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_session.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_session.h
    branches/soc-2013-paint/intern/cycles/blender/blender_shader.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_sync.cpp
    branches/soc-2013-paint/intern/cycles/blender/blender_sync.h
    branches/soc-2013-paint/intern/cycles/blender/blender_util.h
    branches/soc-2013-paint/intern/cycles/bvh/bvh.cpp
    branches/soc-2013-paint/intern/cycles/device/device.cpp
    branches/soc-2013-paint/intern/cycles/device/device.h
    branches/soc-2013-paint/intern/cycles/device/device_cpu.cpp
    branches/soc-2013-paint/intern/cycles/device/device_cuda.cpp
    branches/soc-2013-paint/intern/cycles/device/device_intern.h
    branches/soc-2013-paint/intern/cycles/device/device_memory.h
    branches/soc-2013-paint/intern/cycles/device/device_multi.cpp
    branches/soc-2013-paint/intern/cycles/device/device_network.cpp
    branches/soc-2013-paint/intern/cycles/device/device_network.h
    branches/soc-2013-paint/intern/cycles/device/device_opencl.cpp
    branches/soc-2013-paint/intern/cycles/device/device_task.cpp
    branches/soc-2013-paint/intern/cycles/device/device_task.h
    branches/soc-2013-paint/intern/cycles/doc/license/CMakeLists.txt
    branches/soc-2013-paint/intern/cycles/doc/license/readme.txt
    branches/soc-2013-paint/intern/cycles/kernel/closure/bsdf.h
    branches/soc-2013-paint/intern/cycles/kernel/closure/bsdf_microfacet.h
    branches/soc-2013-paint/intern/cycles/kernel/closure/bsdf_oren_nayar.h
    branches/soc-2013-paint/intern/cycles/kernel/closure/bssrdf.h
    branches/soc-2013-paint/intern/cycles/kernel/closure/volume.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel.cl
    branches/soc-2013-paint/intern/cycles/kernel/kernel.cpp
    branches/soc-2013-paint/intern/cycles/kernel/kernel.cu
    branches/soc-2013-paint/intern/cycles/kernel/kernel.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_accumulate.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh_traversal.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_camera.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_compat_cpu.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_compat_cuda.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_compat_opencl.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_curve.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_differential.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_displace.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_emission.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_film.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_globals.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_jitter.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_light.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_math.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_montecarlo.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_object.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_passes.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_path.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_primitive.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_random.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_shader.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_sse2.cpp
    branches/soc-2013-paint/intern/cycles/kernel/kernel_sse3.cpp
    branches/soc-2013-paint/intern/cycles/kernel/kernel_subsurface.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_textures.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_triangle.h
    branches/soc-2013-paint/intern/cycles/kernel/kernel_types.h
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_bssrdf.cpp
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_bssrdf.h
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_closures.cpp
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_closures.h
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_globals.h
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_services.cpp
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_services.h
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.cpp
    branches/soc-2013-paint/intern/cycles/kernel/osl/osl_shader.h
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_add_closure.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_ambient_occlusion.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_attribute.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_background.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_blackbody.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_brick_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_brightness.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_bump.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_camera.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_checker_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_color.h
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_combine_hsv.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_combine_rgb.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_color.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_float.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_int.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_normal.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_point.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_string.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_convert_from_vector.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_diffuse_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_emission.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_environment_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_fresnel.h
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_fresnel.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_gamma.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_geometry.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_glass_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_glossy_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_gradient_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_hair_info.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_holdout.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_hsv.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_image_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_invert.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_layer_weight.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_light_falloff.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_light_path.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_magic_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_mapping.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_math.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_mix.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_mix_closure.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_musgrave_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_noise_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_normal.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_normal_map.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_object_info.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_output_displacement.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_output_surface.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_output_volume.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_particle_info.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_refraction_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_rgb_curves.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_rgb_ramp.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_separate_hsv.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_separate_rgb.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_set_normal.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_sky_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_subsurface_scattering.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_tangent.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_texture.h
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_texture_coordinate.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_toon_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_translucent_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_transparent_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_value.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_vector_curves.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_vector_math.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_vector_transform.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_velvet_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_voronoi_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_ward_bsdf.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_wave_texture.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_wavelength.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/node_wireframe.osl
    branches/soc-2013-paint/intern/cycles/kernel/shaders/oslutil.h
    branches/soc-2013-paint/intern/cycles/kernel/shaders/stdosl.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_attribute.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_brick.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_brightness.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_camera.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_checker.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_closure.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_convert.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_displace.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_fresnel.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_gamma.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_geometry.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_gradient.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_hsv.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_image.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_invert.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_light_path.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_magic.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_mapping.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_math.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_mix.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_musgrave.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_noisetex.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_normal.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_ramp.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_sepcomb_hsv.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_sepcomb_rgb.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_sky.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_tex_coord.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_texture.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_types.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_value.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_vector_transform.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_voronoi.h
    branches/soc-2013-paint/intern/cycles/kernel/svm/svm_wave.h
    branches/soc-2013-paint/intern/cycles/render/attribute.cpp
    branches/soc-2013-paint/intern/cycles/render/attribute.h
    branches/soc-2013-paint/intern/cycles/render/background.cpp
    branches/soc-2013-paint/intern/cycles/render/background.h
    branches/soc-2013-paint/intern/cycles/render/blackbody.h
    branches/soc-2013-paint/intern/cycles/render/bssrdf.cpp
    branches/soc-2013-paint/intern/cycles/render/bssrdf.h
    branches/soc-2013-paint/intern/cycles/render/buffers.cpp
    branches/soc-2013-paint/intern/cycles/render/buffers.h
    branches/soc-2013-paint/intern/cycles/render/camera.cpp
    branches/soc-2013-paint/intern/cycles/render/camera.h
    branches/soc-2013-paint/intern/cycles/render/curves.cpp
    branches/soc-2013-paint/intern/cycles/render/curves.h
    branches/soc-2013-paint/intern/cycles/render/film.cpp
    branches/soc-2013-paint/intern/cycles/render/film.h
    branches/soc-2013-paint/intern/cycles/render/graph.cpp
    branches/soc-2013-paint/intern/cycles/render/graph.h
    branches/soc-2013-paint/intern/cycles/render/image.cpp
    branches/soc-2013-paint/intern/cycles/render/image.h
    branches/soc-2013-paint/intern/cycles/render/integrator.cpp
    branches/soc-2013-paint/intern/cycles/render/integrator.h
    branches/soc-2013-paint/intern/cycles/render/light.cpp
    branches/soc-2013-paint/intern/cycles/render/light.h
    branches/soc-2013-paint/intern/cycles/render/mesh.cpp
    branches/soc-2013-paint/intern/cycles/render/mesh.h
    branches/soc-2013-paint/intern/cycles/render/mesh_displace.cpp
    branches/soc-2013-paint/intern/cycles/render/nodes.cpp
    branches/soc-2013-paint/intern/cycles/render/nodes.h
    branches/soc-2013-paint/intern/cycles/render/object.cpp
    branches/soc-2013-paint/intern/cycles/render/object.h
    branches/soc-2013-paint/intern/cycles/render/osl.cpp
    branches/soc-2013-paint/intern/cycles/render/osl.h
    branches/soc-2013-paint/intern/cycles/render/particles.cpp
    branches/soc-2013-paint/intern/cycles/render/particles.h
    branches/soc-2013-paint/intern/cycles/render/scene.cpp
    branches/soc-2013-paint/intern/cycles/render/scene.h
    branches/soc-2013-paint/intern/cycles/render/session.cpp
    branches/soc-2013-paint/intern/cycles/render/session.h
    branches/soc-2013-paint/intern/cycles/render/shader.cpp
    branches/soc-2013-paint/intern/cycles/render/shader.h
    branches/soc-2013-paint/intern/cycles/render/sobol.h
    branches/soc-2013-paint/intern/cycles/render/svm.cpp
    branches/soc-2013-paint/intern/cycles/render/svm.h
    branches/soc-2013-paint/intern/cycles/render/tables.cpp
    branches/soc-2013-paint/intern/cycles/render/tables.h
    branches/soc-2013-paint/intern/cycles/render/tile.cpp
    branches/soc-2013-paint/intern/cycles/render/tile.h
    branches/soc-2013-paint/intern/cycles/subd/subd_build.h
    branches/soc-2013-paint/intern/cycles/subd/subd_dice.cpp
    branches/soc-2013-paint/intern/cycles/subd/subd_dice.h
    branches/soc-2013-paint/intern/cycles/subd/subd_patch.cpp
    branches/soc-2013-paint/intern/cycles/subd/subd_patch.h
    branches/soc-2013-paint/intern/cycles/subd/subd_split.cpp
    branches/soc-2013-paint/intern/cycles/subd/subd_split.h
    branches/soc-2013-paint/intern/cycles/subd/subd_stencil.cpp
    branches/soc-2013-paint/intern/cycles/util/CMakeLists.txt
    branches/soc-2013-paint/intern/cycles/util/util_algorithm.h
    branches/soc-2013-paint/intern/cycles/util/util_args.h
    branches/soc-2013-paint/intern/cycles/util/util_boundbox.h
    branches/soc-2013-paint/intern/cycles/util/util_cache.cpp
    branches/soc-2013-paint/intern/cycles/util/util_cache.h
    branches/soc-2013-paint/intern/cycles/util/util_color.h
    branches/soc-2013-paint/intern/cycles/util/util_cuda.cpp
    branches/soc-2013-paint/intern/cycles/util/util_cuda.h
    branches/soc-2013-paint/intern/cycles/util/util_debug.h
    branches/soc-2013-paint/intern/cycles/util/util_dynlib.cpp
    branches/soc-2013-paint/intern/cycles/util/util_dynlib.h
    branches/soc-2013-paint/intern/cycles/util/util_foreach.h
    branches/soc-2013-paint/intern/cycles/util/util_function.h
    branches/soc-2013-paint/intern/cycles/util/util_hash.h
    branches/soc-2013-paint/intern/cycles/util/util_image.h
    branches/soc-2013-paint/intern/cycles/util/util_list.h
    branches/soc-2013-paint/intern/cycles/util/util_map.h
    branches/soc-2013-paint/intern/cycles/util/util_math.h
    branches/soc-2013-paint/intern/cycles/util/util_opengl.h
    branches/soc-2013-paint/intern/cycles/util/util_param.h
    branches/soc-2013-paint/intern/cycles/util/util_path.cpp
    branches/soc-2013-paint/intern/cycles/util/util_path.h
    branches/soc-2013-paint/intern/cycles/util/util_progress.h
    branches/soc-2013-paint/intern/cycles/util/util_set.h
    branches/soc-2013-paint/intern/cycles/util/util_stats.h
    branches/soc-2013-paint/intern/cycles/util/util_string.cpp
    branches/soc-2013-paint/intern/cycles/util/util_string.h
    branches/soc-2013-paint/intern/cycles/util/util_system.cpp
    branches/soc-2013-paint/intern/cycles/util/util_system.h
    branches/soc-2013-paint/intern/cycles/util/util_task.cpp
    branches/soc-2013-paint/intern/cycles/util/util_task.h
    branches/soc-2013-paint/intern/cycles/util/util_thread.h
    branches/soc-2013-paint/intern/cycles/util/util_time.cpp
    branches/soc-2013-paint/intern/cycles/util/util_time.h
    branches/soc-2013-paint/intern/cycles/util/util_transform.cpp
    branches/soc-2013-paint/intern/cycles/util/util_transform.h
    branches/soc-2013-paint/intern/cycles/util/util_types.h
    branches/soc-2013-paint/intern/cycles/util/util_vector.h
    branches/soc-2013-paint/intern/cycles/util/util_view.cpp
    branches/soc-2013-paint/intern/cycles/util/util_view.h
    branches/soc-2013-paint/intern/cycles/util/util_xml.h
    branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/bl_extract_messages.py
    branches/soc-2013-paint/release/scripts/modules/bl_i18n_utils/settings.py
    branches/soc-2013-paint/release/scripts/modules/bpy_extras/io_utils.py
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_sequencer.py
    branches/soc-2013-paint/release/scripts/startup/bl_ui/space_view3d.py
    branches/soc-2013-paint/release/scripts/templates_py/script_stub.py
    branches/soc-2013-paint/source/blender/blenkernel/BKE_armature.h
    branches/soc-2013-paint/source/blender/blenkernel/intern/object_deform.c
    branches/soc-2013-paint/source/blender/blenkernel/intern/pbvh_bmesh.c
    branches/soc-2013-paint/source/blender/blenlib/BLI_edgehash.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_ghash.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_utildefines.h
    branches/soc-2013-paint/source/blender/blenlib/CMakeLists.txt
    branches/soc-2013-paint/source/blender/blenlib/intern/BLI_ghash.c
    branches/soc-2013-paint/source/blender/blenlib/intern/edgehash.c
    branches/soc-2013-paint/source/blender/blenlib/intern/smallhash.c
    branches/soc-2013-paint/source/blender/bmesh/CMakeLists.txt
    branches/soc-2013-paint/source/blender/bmesh/bmesh.h
    branches/soc-2013-paint/source/blender/bmesh/bmesh_class.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_construct.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_edgeloop.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_log.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_opdefines.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_operators_private.h
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_queries.c
    branches/soc-2013-paint/source/blender/bmesh/intern/bmesh_queries.h
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_connect_nonplanar.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_create.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_dissolve.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_edgenet.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_extrude.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_holes.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_hull.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_inset.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_normals.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_poke.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_removedoubles.c
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_symmetrize.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_bevel.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_decimate_dissolve.c
    branches/soc-2013-paint/source/blender/compositor/intern/COM_WorkScheduler.cpp
    branches/soc-2013-paint/source/blender/compositor/operations/COM_MapUVOperation.cpp
    branches/soc-2013-paint/source/blender/compositor/operations/COM_PlaneTrackWarpImageOperation.cpp
    branches/soc-2013-paint/source/blender/editors/include/ED_anim_api.h
    branches/soc-2013-paint/source/blender/editors/include/ED_armature.h
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_knife.c
    branches/soc-2013-paint/source/blender/editors/mesh/editmesh_select.c
    branches/soc-2013-paint/source/blender/editors/sculpt_paint/sculpt_uv.c
    branches/soc-2013-paint/source/blender/editors/space_node/drawnode.c
    branches/soc-2013-paint/source/blender/editors/space_outliner/outliner_tree.c
    branches/soc-2013-paint/source/blender/editors/transform/transform_conversions.c
    branches/soc-2013-paint/source/blender/editors/uvedit/uvedit_smart_stitch.c
    branches/soc-2013-paint/source/blender/makesdna/DNA_ID.h
    branches/soc-2013-paint/source/blender/makesdna/DNA_node_types.h
    branches/soc-2013-paint/source/blender/makesdna/DNA_scene_types.h
    branches/soc-2013-paint/source/blender/makesdna/DNA_space_types.h
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_define.c
    branches/soc-2013-paint/source/blender/makesrna/intern/rna_nodetree.c
    branches/soc-2013-paint/source/blender/modifiers/intern/MOD_bevel.c
    branches/soc-2013-paint/source/blender/nodes/NOD_static_types.h
    branches/soc-2013-paint/source/blender/nodes/shader/nodes/node_shader_subsurface_scattering.c
    branches/soc-2013-paint/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
    branches/soc-2013-paint/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/BL_BlenderShader.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/BL_BlenderShader.h
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_Light.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_Light.h
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_PythonInit.cpp
    branches/soc-2013-paint/source/gameengine/Ketsji/KX_Scene.cpp
    branches/soc-2013-paint/source/gameengine/Rasterizer/RAS_BucketManager.cpp

Added Paths:
-----------
    branches/soc-2013-paint/intern/cycles/kernel/kernel_bvh_subsurface.h
    branches/soc-2013-paint/source/blender/blenlib/BLI_linklist_stack.h
    branches/soc-2013-paint/source/blender/bmesh/operators/bmo_fill_attribute.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_edgenet.c
    branches/soc-2013-paint/source/blender/bmesh/tools/bmesh_edgenet.h

Removed Paths:
-------------
    branches/soc-2013-paint/intern/cycles/doc/license/Blender.txt
    branches/soc-2013-paint/intern/cycles/doc/license/GPL.txt
    branches/soc-2013-paint/intern/cycles/util/util_memarena.cpp
    branches/soc-2013-paint/intern/cycles/util/util_memarena.h

Modified: branches/soc-2013-paint/intern/cycles/app/cycles_server.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/app/cycles_server.cpp	2013-08-18 15:48:51 UTC (rev 59242)
+++ branches/soc-2013-paint/intern/cycles/app/cycles_server.cpp	2013-08-18 16:15:30 UTC (rev 59243)
@@ -1,19 +1,17 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
  */
 
 #include <stdio.h>

Modified: branches/soc-2013-paint/intern/cycles/app/cycles_test.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/app/cycles_test.cpp	2013-08-18 15:48:51 UTC (rev 59242)
+++ branches/soc-2013-paint/intern/cycles/app/cycles_test.cpp	2013-08-18 16:15:30 UTC (rev 59243)
@@ -1,19 +1,17 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
  */
 
 #include <stdio.h>

Modified: branches/soc-2013-paint/intern/cycles/app/cycles_xml.cpp
===================================================================
--- branches/soc-2013-paint/intern/cycles/app/cycles_xml.cpp	2013-08-18 15:48:51 UTC (rev 59242)
+++ branches/soc-2013-paint/intern/cycles/app/cycles_xml.cpp	2013-08-18 16:15:30 UTC (rev 59243)
@@ -1,19 +1,17 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
  */
 
 #include <stdio.h>

Modified: branches/soc-2013-paint/intern/cycles/app/cycles_xml.h
===================================================================
--- branches/soc-2013-paint/intern/cycles/app/cycles_xml.h	2013-08-18 15:48:51 UTC (rev 59242)
+++ branches/soc-2013-paint/intern/cycles/app/cycles_xml.h	2013-08-18 16:15:30 UTC (rev 59243)
@@ -1,19 +1,17 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License
  */
 
 #ifndef __CYCLES_XML__

Modified: branches/soc-2013-paint/intern/cycles/app/io_export_cycles_xml.py
===================================================================
--- branches/soc-2013-paint/intern/cycles/app/io_export_cycles_xml.py	2013-08-18 15:48:51 UTC (rev 59242)
+++ branches/soc-2013-paint/intern/cycles/app/io_export_cycles_xml.py	2013-08-18 16:15:30 UTC (rev 59243)
@@ -1,19 +1,17 @@
 #
-# Copyright 2011, Blender Foundation.
+# Copyright 2011-2013 Blender Foundation
 #
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# http://www.apache.org/licenses/LICENSE-2.0
 #
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
 #
 
 # XML exporter for generating test files, not intended for end users

Modified: branches/soc-2013-paint/intern/cycles/blender/CCL_api.h
===================================================================
--- branches/soc-2013-paint/intern/cycles/blender/CCL_api.h	2013-08-18 15:48:51 UTC (rev 59242)
+++ branches/soc-2013-paint/intern/cycles/blender/CCL_api.h	2013-08-18 16:15:30 UTC (rev 59243)
@@ -1,19 +1,17 @@
 /*
- * Copyright 2011, Blender Foundation.
+ * Copyright 2011-2013 Blender Foundation
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list