svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27895:27901...
authorCampbell Barton <ideasman42@gmail.com>
Wed, 31 Mar 2010 20:39:08 +0000 (20:39 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 31 Mar 2010 20:39:08 +0000 (20:39 +0000)
commitc19725b2667cfcec64135901ccb40b3c9ec37e00
treead97abf53127e70559bc21f0696a91b65f7c0fe7
parent3c6a0274b94709e4b9767de5054c8a5402a97db3
svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27895:27901; svn merge https://svn.blender.org/svnroot/bf-blender/branches/render25 -r27902:27907, skipping 27902
release/scripts/io/import_anim_bvh.py
release/scripts/io/import_scene_3ds.py
release/scripts/io/import_scene_obj.py
release/scripts/op/add_mesh_torus.py
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_fcurve.c
source/blender/makesrna/intern/rna_pose.c
source/blender/nodes/intern/SHD_nodes/SHD_material.c