diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-05-29 04:48:03 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-05-29 04:48:03 +0400 |
| commit | 9cfd093a934097a3054f89b70168fa6ed5be695e (patch) | |
| tree | c9212d55e88b7d626c108894c2113eed29513d5b /source/blender/makesrna/intern/rna_constraint.c | |
| parent | 07dca944766e702453730fe1a55605dab9380c6e (diff) | |
| parent | fc3904d7b3189e4d201666464d71feba1619a36e (diff) | |
Merge with trunk r36987.
Diffstat (limited to 'source/blender/makesrna/intern/rna_constraint.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_constraint.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_constraint.c b/source/blender/makesrna/intern/rna_constraint.c index 4bd3c8fbc7c..21c19f4f2e3 100644 --- a/source/blender/makesrna/intern/rna_constraint.c +++ b/source/blender/makesrna/intern/rna_constraint.c @@ -243,7 +243,7 @@ static void rna_Constraint_ik_type_set(struct PointerRNA *ptr, int value) } } -static EnumPropertyItem *rna_Constraint_owner_space_itemf(bContext *C, PointerRNA *ptr, int *free) +static EnumPropertyItem *rna_Constraint_owner_space_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { Object *ob= (Object*)ptr->id.data; bConstraint *con= (bConstraint*)ptr->data; @@ -254,7 +254,7 @@ static EnumPropertyItem *rna_Constraint_owner_space_itemf(bContext *C, PointerRN return space_object_items; } -static EnumPropertyItem *rna_Constraint_target_space_itemf(bContext *C, PointerRNA *ptr, int *free) +static EnumPropertyItem *rna_Constraint_target_space_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { bConstraint *con= (bConstraint*)ptr->data; bConstraintTypeInfo *cti= constraint_get_typeinfo(con); |