NLA SoC: Fixed merge errors. Manually copied over any files from 2.5 that were modifi...
authorJoshua Leung <aligorith@gmail.com>
Tue, 2 Jun 2009 09:58:06 +0000 (09:58 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 2 Jun 2009 09:58:06 +0000 (09:58 +0000)
commit6a35302a54071bfd12df7d4a71e710d1e250b34d
treef8c4fd7422681188254a8c5ed598c239f4b8b342
parent37f47ef3862a85d4d95fe5b18ab3d6b9c88ccdd3
NLA SoC: Fixed merge errors. Manually copied over any files from 2.5 that were modified in a commit by Brecht between the time when I had done the previous merge and the time when the commit for that finally got through.
22 files changed:
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/intern/library.c
source/blender/editors/include/ED_object.h
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_api.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/object/editconstraint.c
source/blender/editors/object/object_intern.h
source/blender/editors/object/object_modifier.c
source/blender/editors/object/object_ops.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/makesrna/RNA_enum_types.h
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_pose.c
source/blender/makesrna/intern/rna_sound.c
source/blender/makesrna/intern/rna_ui.c
source/blender/windowmanager/WM_types.h