Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 24 Aug 2011 09:44:08 +0000 (09:44 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Wed, 24 Aug 2011 09:44:08 +0000 (09:44 +0000)
commit29bdf37f9d1a5a45b98aeed15d415df27050615b
treeb260a2fcb947b76127fd073a335c4f775cdb8d87
parentbd38aa51ad029f114813d3d8f5a069571255b211
parentf9bffb3ca0ca88a7e774b0ee0da1d384707f0495
Cycles: svn merge -r39457:39669 https://svn.blender.org/svnroot/bf-blender/trunk/blender
31 files changed:
CMakeLists.txt
build_files/cmake/macros.cmake
release/scripts/startup/bl_ui/properties_particle.py
release/scripts/startup/bl_ui/properties_texture.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_widgets.c
source/blender/editors/object/object_add.c
source/blender/editors/render/render_shading.c
source/blender/editors/screen/area.c
source/blender/editors/space_buttons/buttons_context.c
source/blender/editors/space_node/SConscript
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/view3d_draw.c
source/blender/editors/space_view3d/view3d_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/gpu/intern/gpu_material.c
source/blender/gpu/intern/gpu_shader_material.glsl
source/blender/gpu/intern/gpu_shader_material.glsl.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_scene.c
source/blender/nodes/intern/SHD_nodes/SHD_fresnel.c
source/blender/python/intern/bpy_interface.c
source/blender/render/SConscript
source/blender/render/intern/source/render_texture.c
source/creator/CMakeLists.txt
source/creator/creator.c