Merging r50374 through r50412 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 5 Sep 2012 11:42:20 +0000 (11:42 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 5 Sep 2012 11:42:20 +0000 (11:42 +0000)
commit3963425006ea738c93ca30b50cc0332dd522f0d9
treea5aac5a9936d695466feae63494134eb1f5fbec6
parent8dff07ef9a4a6d57529977c0cfb80fc6367184c1
Merging r50374 through r50412 from trunk into soc-2011-tomato
92 files changed:
extern/bullet2/CMakeLists.txt
intern/cycles/app/cycles_test.cpp
intern/cycles/blender/addon/properties.py
intern/cycles/blender/addon/ui.py
intern/cycles/blender/blender_object.cpp
intern/cycles/blender/blender_particles.cpp
intern/cycles/blender/blender_session.h
intern/cycles/blender/blender_sync.cpp
intern/cycles/blender/blender_sync.h
intern/cycles/blender/blender_util.h
intern/cycles/kernel/kernel_displace.h
intern/cycles/kernel/kernel_path.h
intern/cycles/kernel/kernel_shader.h
intern/cycles/kernel/osl/nodes/CMakeLists.txt
intern/cycles/kernel/osl/nodes/node_brick_texture.osl [new file with mode: 0644]
intern/cycles/kernel/osl/nodes/node_gradient_texture.osl
intern/cycles/kernel/osl/nodes/node_holdout.osl
intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl
intern/cycles/kernel/osl/nodes/node_noise_texture.osl
intern/cycles/kernel/osl/nodes/node_wave_texture.osl
intern/cycles/kernel/osl/osl_shader.cpp
intern/cycles/kernel/osl/osl_shader.h
intern/cycles/render/camera.cpp
intern/cycles/render/camera.h
intern/cycles/render/nodes.cpp
intern/cycles/render/osl.cpp
release/scripts/modules/addon_utils.py
release/scripts/startup/bl_operators/wm.py
release/scripts/startup/bl_ui/space_sequencer.py
release/scripts/templates/operator_modal.py
release/scripts/templates/operator_modal_draw.py
release/scripts/templates/operator_modal_timer.py
release/scripts/templates/operator_modal_view3d.py
source/blender/blenkernel/BKE_armature.h
source/blender/blenkernel/BKE_blender.h
source/blender/blenkernel/BKE_deform.h
source/blender/blenkernel/BKE_object_deform.h [new file with mode: 0644]
source/blender/blenkernel/BKE_sequencer.h
source/blender/blenkernel/CMakeLists.txt
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/armature.c
source/blender/blenkernel/intern/deform.c
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/object_deform.c [new file with mode: 0644]
source/blender/blenkernel/intern/seqmodifier.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenlib/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/compositor/COM_compositor.h
source/blender/compositor/intern/COM_Device.h
source/blender/compositor/intern/COM_Node.cpp
source/blender/compositor/intern/COM_Node.h
source/blender/compositor/intern/COM_NodeBase.h
source/blender/compositor/intern/COM_Socket.h
source/blender/compositor/intern/COM_WorkScheduler.cpp
source/blender/compositor/intern/COM_compositor.cpp
source/blender/compositor/nodes/COM_GroupNode.cpp
source/blender/compositor/nodes/COM_ImageNode.cpp
source/blender/compositor/operations/COM_CompositorOperation.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_ops.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/io/io_collada.c
source/blender/editors/mesh/editmesh_knife.c
source/blender/editors/object/object_vgroup.c
source/blender/editors/sculpt_paint/paint_vertex.c
source/blender/editors/space_clip/clip_toolbar.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_buttons.c
source/blender/editors/space_node/node_templates.c
source/blender/editors/space_view3d/drawmesh.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/util/CMakeLists.txt
source/blender/imbuf/intern/moviecache.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/makesrna/intern/rna_render.c
source/blender/makesrna/intern/rna_sequencer.c
source/blender/makesrna/rna_cleanup/rna_cleaner.py
source/blender/nodes/NOD_shader.h
source/blender/nodes/composite/node_composite_tree.c
source/blender/python/intern/bpy_interface.c
source/blender/render/intern/source/external_engine.c
source/blender/render/intern/source/pipeline.c
source/blender/render/intern/source/render_result.c
source/blender/render/intern/source/render_texture.c
source/blender/windowmanager/intern/wm_event_system.c
source/blender/windowmanager/intern/wm_operators.c
source/tests/pep8.py