Blender Git Loki
Git Commits -> Revision c19725b
Revision c19725b by Campbell Barton (master) March 31, 2010, 20:39 (GMT) |
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 |
Commit Details:
Full Hash: c19725b2667cfcec64135901ccb40b3c9ec37e00
SVN Revision: 27908
Parent Commit: 3c6a027
Lines Changed: +188, -14
8 Modified Paths:
/release/scripts/io/import_anim_bvh.py (+2, -1) (Diff)
/release/scripts/io/import_scene_3ds.py (+2, -2) (Diff)
/release/scripts/io/import_scene_obj.py (+2, -1) (Diff)
/release/scripts/op/add_mesh_torus.py (+2, -3) (Diff)
/source/blender/makesrna/intern/rna_action.c (+59, -0) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+92, -4) (Diff)
/source/blender/makesrna/intern/rna_pose.c (+19, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_material.c (+10, -1) (Diff)
/release/scripts/io/import_scene_3ds.py (+2, -2) (Diff)
/release/scripts/io/import_scene_obj.py (+2, -1) (Diff)
/release/scripts/op/add_mesh_torus.py (+2, -3) (Diff)
/source/blender/makesrna/intern/rna_action.c (+59, -0) (Diff)
/source/blender/makesrna/intern/rna_fcurve.c (+92, -4) (Diff)
/source/blender/makesrna/intern/rna_pose.c (+19, -2) (Diff)
/source/blender/nodes/intern/SHD_nodes/SHD_material.c (+10, -1) (Diff)