svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20855:20928
authorCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jun 2009 14:21:58 +0000 (14:21 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 16 Jun 2009 14:21:58 +0000 (14:21 +0000)
commita1cf7988c1d71b5b0a975eff1e5de1d744143606
tree18b885d0d35b583b2ee7e90eb79ae26675f20fa1
parent2d40b8d56ff100b71dac7c4694f6115dcc0b01b5
parent1025b750ee873edee48b03653ab0e6a7988245d0
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r20855:20928

Sequencer changes from source/blender/src coming next
14 files changed:
projectfiles_vc9/blender/nodes/nodes.vcproj
source/blender/blenkernel/BKE_modifier.h
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/BME_tools.c
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/modifier.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/readfile.c
source/blender/makesdna/DNA_sequence_types.h
source/blender/render/intern/source/texture.c
source/gameengine/Converter/SConscript
source/gameengine/Ketsji/KX_PythonInit.cpp