NLA SoC: Merge from 2.5
authorJoshua Leung <aligorith@gmail.com>
Mon, 22 Jun 2009 04:39:35 +0000 (04:39 +0000)
committerJoshua Leung <aligorith@gmail.com>
Mon, 22 Jun 2009 04:39:35 +0000 (04:39 +0000)
commitaa267976b86f90423204e11a30eec4e0def0f296
treee1b09c017eef0191473b9aa1e59fd08ffe705f43
parentf1fb09a493b79e6320a651a035203dff98c3b580
parent1efffc1f564af0597512699890d7be9f41a6aee2
NLA SoC: Merge from 2.5

21043 to 21072

(NOTE TO SELF: Campbell made a commit in 2.5 before this merge finished)
source/blender/blenkernel/BKE_utildefines.h
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_space.c