Merged changes from trunk to soc-2008-mxcurioni: svn merge -r 14534:14595 https:...
authorMaxime Curioni <maxime.curioni@gmail.com>
Mon, 28 Apr 2008 16:21:26 +0000 (16:21 +0000)
committerMaxime Curioni <maxime.curioni@gmail.com>
Mon, 28 Apr 2008 16:21:26 +0000 (16:21 +0000)
commit812a0eb1fb088edff7a32198b20828d8ea192255
treeddc153555cc07bb80163d2a2ebfa9c5b7e8bed48
parent2fb9b30485db8bbf4ff24302ce3fa9780d89af09
parenta0b2195a8d87fffec2690d8477a596c5e028a3d0
Merged changes from trunk to soc-2008-mxcurioni: svn merge -r 14534:14595 https://svn.blender.org/svnroot/bf-blender/trunk/blender/
source/blender/blenkernel/intern/object.c
source/blender/python/BPY_interface.c
source/blender/python/api2_2x/Node.c
source/blender/src/buttons_object.c
source/blender/src/usiblender.c