NLA SoC: Merge from 2.5 20441 to 20570 (HEAD)
authorJoshua Leung <aligorith@gmail.com>
Tue, 2 Jun 2009 01:40:53 +0000 (01:40 +0000)
committerJoshua Leung <aligorith@gmail.com>
Tue, 2 Jun 2009 01:40:53 +0000 (01:40 +0000)
There were a few conflicts/missing files. Hopefully everything updated ok...

16 files changed:
1  2 
release/ui/buttons_data_modifier.py
source/blender/blenkernel/intern/fcurve.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/include/UI_interface.h
source/blender/editors/include/UI_view2d.h
source/blender/editors/interface/interface.c
source/blender/editors/interface/interface_api.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/interface/view2d.c
source/blender/editors/object/object_modifier.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/makesdna/DNA_anim_types.h
source/blender/makesrna/intern/rna_constraint.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_ui.c

@@@ -380,4 -402,4 +402,4 @@@ class DATA_PT_modifiers(DataButtonsPane
                col.itemR(md, "width", slider=True)
                col.itemR(md, "narrowness", slider=True)
  
--bpy.types.register(DATA_PT_modifiers)
++bpy.types.register(DATA_PT_modifiers)
@@@ -559,7 -581,9 +579,8 @@@ uiBlock *uiLayoutFreeBlock(uiLayout *la
  void uiTemplateHeader(uiLayout *layout, struct bContext *C);
  void uiTemplateHeaderID(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr, char *propname,
        char *newop, char *openop, char *unlinkop);
 -uiLayout *uiTemplateModifier(uiLayout *layout, struct PointerRNA *ptr);
 -uiLayout *uiTemplateConstraint(uiLayout *layout, struct PointerRNA *ptr);
 +uiLayout *uiTemplateModifier(uiLayout *layout, struct bContext *C, struct PointerRNA *ptr);
+ void uiTemplatePreview(uiLayout *layout, struct ID *id);
  
  /* items */
  void uiItemO(uiLayout *layout, char *name, int icon, char *opname);
@@@ -1241,6 -1555,7 +1555,7 @@@ void RNA_def_constraint(BlenderRNA *brn
        rna_def_constraint_rotation_limit(brna);
        rna_def_constraint_location_limit(brna);
        rna_def_constraint_transform(brna);
+       rna_def_constraint_shrinkwrap(brna);
  }
  
 -#endif
 +#endif