diff options
| author | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-05-07 02:19:13 +0400 |
|---|---|---|
| committer | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-05-07 02:19:13 +0400 |
| commit | 6c86b70145ee46b647061f4b6455c3e82268df36 (patch) | |
| tree | 629630f3cc6b6f44ffd5072da5dd81e57fd9861b /source/blender/editors/object/object_intern.h | |
| parent | 2ebebc563e2722ee08ffc0fb9204522964538df1 (diff) | |
| parent | 5fb53b6b301c5ed03cdb3f800bb4af9395369a8f (diff) | |
svn merge ^/trunk/blender -r46000:46100
some conflicts. had to backup my code, accept with "tc" and introduce my own code again.
Hope I didnt leave anything out.
Diffstat (limited to 'source/blender/editors/object/object_intern.h')
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 8ba64e66025..28de0b4b33f 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -185,7 +185,7 @@ void CONSTRAINT_OT_limitdistance_reset(struct wmOperatorType *ot); void CONSTRAINT_OT_childof_set_inverse(struct wmOperatorType *ot); void CONSTRAINT_OT_childof_clear_inverse(struct wmOperatorType *ot); void CONSTRAINT_OT_objectsolver_set_inverse(struct wmOperatorType *ot); -void CONSTRAINT_OT_objectsolver_clear_inverse (struct wmOperatorType *ot); +void CONSTRAINT_OT_objectsolver_clear_inverse(struct wmOperatorType *ot); /* object_vgroup.c */ void OBJECT_OT_vertex_group_add(struct wmOperatorType *ot); |