Merge from 2.5 r20991 through r21037
authorArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 20 Jun 2009 16:48:58 +0000 (16:48 +0000)
committerArystanbek Dyussenov <arystan.d@gmail.com>
Sat, 20 Jun 2009 16:48:58 +0000 (16:48 +0000)
commita8b403db3559da1088256fac441af28566f3f27d
tree1486918ac2b41fff51c804e725781dad8ff43a8d
parent705fbec7688c88a801c41bb3c8889cd0527adc30
parenta42b436a98263749955c1cc85963c3fa0945f2c1
Merge from 2.5 r20991 through r21037
source/blender/makesrna/intern/rna_object.c