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

index d60df5df528f3718af1b267f10c2f9e4f2961a15,c087e5f5e36d627e6347af4ff23df0868e0abf3c..6de2d6454714d0920b73ccf3c6ded0df1d250243
@@@ -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)
index 144009aaa717066ba60c8627208919e4518bd210,97c2da5297f61e2e5171217aa150e03cd8a3205e..cdb29ecf376304622f9febdbdffb5d764bd6e629
@@@ -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);
index 774f2f9c0ef698e5788b43e9b03992346816513d,02429ffa4bff15f3775cb17138acfd4c1f2218f7..b0b9e2079f111a3a4462fa2e6612aff1f3cc222e
@@@ -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