svn merge -r 21041:21243 https://svn.blender.org/svnroot/bf-blender/branches/blender2...
authorAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 29 Jun 2009 21:50:53 +0000 (21:50 +0000)
committerAndre Susano Pinto <andresusanopinto@gmail.com>
Mon, 29 Jun 2009 21:50:53 +0000 (21:50 +0000)
commitdd7463bd4d0457a6b11515d14cce7871fe5f6fd5
tree37830d0513c8926eeeb34949afa09ed738daf3da
parent1136656bbadc92936fa497e2ddd99bae1b982982
parent5d491681e0d1e6b8450dedc64bd45408bb9066cd
svn merge -r 21041:21243 https://svn.blender.org/svnroot/bf-blender/branches/blender2.5/blender
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_scene.c