Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk...
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 9 Jun 2011 14:53:25 +0000 (14:53 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Thu, 9 Jun 2011 14:53:25 +0000 (14:53 +0000)
commitc5e63925db50e5f047e3161a7e8ff2ae307d66e1
tree21905f6bde0f57d6726461ee44b3a1a5da83bac0
parent03f9f1e4d7ba585c209349205fad26070ab6d305
parent21f5a87999bbc3f022a62812ae1ec1a30fa98135
Cycles: svn merge -r37040:37333 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
37 files changed:
CMakeLists.txt
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/object.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/datafiles/startup.blend.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/CMakeLists.txt
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/interface/interface_panel.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/object/object_add.c
source/blender/editors/screen/area.c
source/blender/editors/screen/screen_edit.c
source/blender/editors/space_node/node_edit.c
source/blender/editors/space_node/space_node.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/space_view3d/space_view3d.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_access.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_lamp.c
source/blender/makesrna/intern/rna_material.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_world.c
source/blender/modifiers/intern/MOD_cloth.c
source/blender/modifiers/intern/MOD_meshdeform.c
source/blender/modifiers/intern/MOD_none.c
source/blender/modifiers/intern/MOD_smoke.c
source/blender/windowmanager/intern/wm_event_system.c
source/creator/CMakeLists.txt
source/creator/creator.c