Blender Git Loki
Git Commits -> Revision 6a35302
Revision 6a35302 by Joshua Leung (master) June 2, 2009, 09:58 (GMT) |
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. |
Commit Details:
Full Hash: 6a35302a54071bfd12df7d4a71e710d1e250b34d
SVN Revision: 20578
Parent Commit: 37f47ef
Lines Changed: +341, -97
22 Modified Paths:
/source/blender/blenkernel/BKE_library.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/library.c (+6, -0) (Diff)
/source/blender/editors/include/ED_object.h (+15, -2) (Diff)
/source/blender/editors/include/UI_interface.h (+6, -3) (Diff)
/source/blender/editors/interface/interface.c (+10, -3) (Diff)
/source/blender/editors/interface/interface_api.c (+8, -3) (Diff)
/source/blender/editors/interface/interface_handlers.c (+5, -1) (Diff)
/source/blender/editors/interface/interface_utils.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+4, -2) (Diff)
/source/blender/editors/object/editconstraint.c (+244, -49) (Diff)
/source/blender/editors/object/object_intern.h (+3, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+2, -0) (Diff)
/source/blender/editors/object/object_ops.c (+2, -0) (Diff)
/source/blender/editors/space_image/image_header.c (+7, -7) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+12, -12) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_pose.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_sound.c (+8, -8) (Diff)
/source/blender/makesrna/intern/rna_ui.c (+1, -1) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+1, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
/source/blender/blenkernel/intern/library.c (+6, -0) (Diff)
/source/blender/editors/include/ED_object.h (+15, -2) (Diff)
/source/blender/editors/include/UI_interface.h (+6, -3) (Diff)
/source/blender/editors/interface/interface.c (+10, -3) (Diff)
/source/blender/editors/interface/interface_api.c (+8, -3) (Diff)
/source/blender/editors/interface/interface_handlers.c (+5, -1) (Diff)
/source/blender/editors/interface/interface_utils.c (+2, -2) (Diff)
/source/blender/editors/interface/interface_widgets.c (+4, -2) (Diff)
/source/blender/editors/object/editconstraint.c (+244, -49) (Diff)
/source/blender/editors/object/object_intern.h (+3, -0) (Diff)
/source/blender/editors/object/object_modifier.c (+2, -0) (Diff)
/source/blender/editors/object/object_ops.c (+2, -0) (Diff)
/source/blender/editors/space_image/image_header.c (+7, -7) (Diff)
/source/blender/editors/space_view3d/view3d_header.c (+12, -12) (Diff)
/source/blender/makesrna/intern/rna_constraint.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_object.c (+2, -2) (Diff)
/source/blender/makesrna/intern/rna_pose.c (+0, -1) (Diff)
/source/blender/makesrna/intern/rna_sound.c (+8, -8) (Diff)
/source/blender/makesrna/intern/rna_ui.c (+1, -1) (Diff)
/source/blender/makesrna/RNA_enum_types.h (+1, -0) (Diff)
/source/blender/windowmanager/WM_types.h (+1, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021