Blender Git Loki

Git Commits -> Revision 3963425

Revision 3963425 by Sergey Sharybin (master)
September 5, 2012, 11:42 (GMT)
Merging r50374 through r50412 from trunk into soc-2011-tomato

Commit Details:

Full Hash: 3963425006ea738c93ca30b50cc0332dd522f0d9
SVN Revision: 50413
Parent Commit: 8dff07e
Lines Changed: +898, -624

3 Added Paths:

/intern/cycles/kernel/osl/nodes/node_brick_texture.osl (+94, -0) (View)
/source/blender/blenkernel/BKE_object_deform.h (+38, -0) (View)
/source/blender/blenkernel/intern/object_deform.c (+156, -0) (View)

89 Modified Paths:

/extern/bullet2/CMakeLists.txt (+2, -0) (Diff)
/intern/cycles/app/cycles_test.cpp (+7, -5) (Diff)
/intern/cycles/blender/addon/properties.py (+1, -1) (Diff)
/intern/cycles/blender/addon/ui.py (+2, -0) (Diff)
/intern/cycles/blender/blender_object.cpp (+1, -2) (Diff)
/intern/cycles/blender/blender_particles.cpp (+1, -2) (Diff)
/intern/cycles/blender/blender_session.h (+1, -2) (Diff)
/intern/cycles/blender/blender_sync.cpp (+1, -4) (Diff)
/intern/cycles/blender/blender_sync.h (+0, -14) (Diff)
/intern/cycles/blender/blender_util.h (+9, -2) (Diff)
/intern/cycles/kernel/kernel_displace.h (+2, -0) (Diff)
/intern/cycles/kernel/kernel_path.h (+23, -7) (Diff)
/intern/cycles/kernel/kernel_shader.h (+17, -0) (Diff)
/intern/cycles/kernel/osl/nodes/CMakeLists.txt (+1, -0) (Diff)
/intern/cycles/kernel/osl/nodes/node_gradient_texture.osl (+16, -21) (Diff)
/intern/cycles/kernel/osl/nodes/node_holdout.osl (+3, -5) (Diff)
/intern/cycles/kernel/osl/nodes/node_musgrave_texture.osl (+14, -11) (Diff)
/intern/cycles/kernel/osl/nodes/node_noise_texture.osl (+8, -11) (Diff)
/intern/cycles/kernel/osl/nodes/node_wave_texture.osl (+7, -5) (Diff)
/intern/cycles/kernel/osl/osl_shader.cpp (+13, -11) (Diff)
/intern/cycles/kernel/osl/osl_shader.h (+2, -1) (Diff)
/intern/cycles/render/camera.cpp (+6, -8) (Diff)
/intern/cycles/render/camera.h (+1, -1) (Diff)
/intern/cycles/render/nodes.cpp (+2, -2) (Diff)
/intern/cycles/render/osl.cpp (+5, -5) (Diff)
/release/scripts/modules/addon_utils.py (+1, -1) (Diff)
/release/scripts/startup/bl_operators/wm.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_sequencer.py (+1, -9) (Diff)
/release/scripts/templates/operator_modal.py (+2, -1) (Diff)
/release/scripts/templates/operator_modal_draw.py (+1, -2) (Diff)
/release/scripts/templates/operator_modal_timer.py (+1, -1) (Diff)
/release/scripts/templates/operator_modal_view3d.py (+1, -2) (Diff)
/source/blender/blenkernel/BKE_armature.h (+0, -2) (Diff)
/source/blender/blenkernel/BKE_blender.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_deform.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+1, -1) (Diff)
/source/blender/blenkernel/CMakeLists.txt (+2, -0) (Diff)
/source/blender/blenkernel/intern/armature.c (+0, -30) (Diff)
/source/blender/blenkernel/intern/deform.c (+53, -3) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+17, -9) (Diff)
/source/blender/blenkernel/intern/image.c (+3, -1) (Diff)
/source/blender/blenkernel/intern/seqmodifier.c (+9, -27) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+1, -35) (Diff)
/source/blender/blenlib/CMakeLists.txt (+1, -0) (Diff)
/source/blender/blenloader/intern/readfile.c (+41, -13) (Diff)
/source/blender/blenloader/intern/writefile.c (+0, -3) (Diff)
/source/blender/compositor/COM_compositor.h (+7, -0) (Diff)
/source/blender/compositor/intern/COM_compositor.cpp (+16, -4) (Diff)
/source/blender/compositor/intern/COM_Device.h (+7, -0) (Diff)
/source/blender/compositor/intern/COM_Node.cpp (+15, -0) (Diff)
/source/blender/compositor/intern/COM_Node.h (+7, -0) (Diff)
/source/blender/compositor/intern/COM_NodeBase.h (+2, -1) (Diff)
/source/blender/compositor/intern/COM_Socket.h (+8, -0) (Diff)
/source/blender/compositor/intern/COM_WorkScheduler.cpp (+19, -6) (Diff)
/source/blender/compositor/nodes/COM_GroupNode.cpp (+1, -10) (Diff)
/source/blender/compositor/nodes/COM_ImageNode.cpp (+9, -0) (Diff)
/source/blender/compositor/operations/COM_CompositorOperation.h (+3, -0) (Diff)
/source/blender/editors/include/UI_interface.h (+3, -1) (Diff)
/source/blender/editors/interface/interface.c (+8, -2) (Diff)
/source/blender/editors/interface/interface_layout.c (+3, -1) (Diff)
/source/blender/editors/interface/interface_ops.c (+8, -8) (Diff)
/source/blender/editors/interface/interface_templates.c (+9, -9) (Diff)
/source/blender/editors/io/io_collada.c (+2, -2) (Diff)
/source/blender/editors/mesh/editmesh_knife.c (+6, -5) (Diff)
/source/blender/editors/object/object_vgroup.c (+23, -17) (Diff)
/source/blender/editors/sculpt_paint/paint_vertex.c (+8, -91) (Diff)
/source/blender/editors/space_clip/clip_toolbar.c (+1, -1) (Diff)
/source/blender/editors/space_logic/logic_window.c (+13, -13) (Diff)
/source/blender/editors/space_node/drawnode.c (+33, -33) (Diff)
/source/blender/editors/space_node/node_buttons.c (+2, -2) (Diff)
/source/blender/editors/space_node/node_templates.c (+2, -2) (Diff)
/source/blender/editors/space_view3d/drawmesh.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_toolbar.c (+1, -1) (Diff)
/source/blender/editors/util/CMakeLists.txt (+1, -0) (Diff)
/source/blender/imbuf/intern/moviecache.c (+5, -4) (Diff)
/source/blender/makesdna/DNA_sequence_types.h (+2, -5) (Diff)
/source/blender/makesrna/intern/rna_render.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_sequencer.c (+18, -85) (Diff)
/source/blender/makesrna/rna_cleanup/rna_cleaner.py (+1, -1) (Diff)
/source/blender/nodes/composite/node_composite_tree.c (+3, -5) (Diff)
/source/blender/nodes/NOD_shader.h (+1, -0) (Diff)
/source/blender/python/intern/bpy_interface.c (+9, -0) (Diff)
/source/blender/render/intern/source/external_engine.c (+6, -4) (Diff)
/source/blender/render/intern/source/pipeline.c (+10, -9) (Diff)
/source/blender/render/intern/source/render_result.c (+46, -28) (Diff)
/source/blender/render/intern/source/render_texture.c (+1, -5) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+3, -2) (Diff)
/source/blender/windowmanager/intern/wm_operators.c (+1, -1) (Diff)
/source/tests/pep8.py (+1, -1) (Diff)
Tehnyt: Miika HämäläinenViimeksi päivitetty: 07.11.2014 14:18MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021