diff options
| author | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-05-09 18:55:50 +0400 |
|---|---|---|
| committer | Ove Murberg Henriksen <sorayasilvermoon@hotmail.com> | 2012-05-09 18:55:50 +0400 |
| commit | 68179be662af72319694b30f5784640812211cd1 (patch) | |
| tree | d7fec3d79bf925cb9ed4c06bbcb89b7e65f49e4c /source/blender/editors/object/object_intern.h | |
| parent | 7b3beec987f4ee129480730889dfdae07acc6419 (diff) | |
| parent | e6a022816cd013b9d0399c4dc3beb522e144ac64 (diff) | |
svn merge ^/trunk/blender -r45927:HEAD --accept=theirs-full
This revision does not compile. code need to be merged in manualy.
Diffstat (limited to 'source/blender/editors/object/object_intern.h')
| -rw-r--r-- | source/blender/editors/object/object_intern.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/editors/object/object_intern.h b/source/blender/editors/object/object_intern.h index 8ba64e66025..e29ab687fff 100644 --- a/source/blender/editors/object/object_intern.h +++ b/source/blender/editors/object/object_intern.h @@ -84,6 +84,7 @@ void OBJECT_OT_proxy_make(struct wmOperatorType *ot); void OBJECT_OT_shade_smooth(struct wmOperatorType *ot); void OBJECT_OT_shade_flat(struct wmOperatorType *ot); void OBJECT_OT_paths_calculate(struct wmOperatorType *ot); +void OBJECT_OT_paths_update(struct wmOperatorType *ot); void OBJECT_OT_paths_clear(struct wmOperatorType *ot); void OBJECT_OT_forcefield_toggle(struct wmOperatorType *ot); @@ -185,7 +186,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); |