diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 01:08:25 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-18 01:08:25 +0400 |
| commit | 0f28c1c27aec41dd22e31aac2c02cdfae785dd1b (patch) | |
| tree | 1c41b37d29a56390d810846cd7fe8f1218e40576 /source/blender/editors/include/ED_uvedit.h | |
| parent | 9be40c026df54fee796c4073ebd4734c55ed5807 (diff) | |
| parent | 408f7963c5cfd65792d826390b01896282de8e97 (diff) | |
svn merge ^/trunk/blender -r43461:43472
Diffstat (limited to 'source/blender/editors/include/ED_uvedit.h')
| -rw-r--r-- | source/blender/editors/include/ED_uvedit.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 2f193292eec..c19872213ca 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -84,7 +84,7 @@ void ED_uvedit_live_unwrap_end(short cancel); void ED_unwrap_lscm(struct Scene *scene, struct Object *obedit, const short sel); /* uvedit_draw.c */ -void draw_uvedit_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene, struct Object *obedit); +void draw_uvedit_main(struct SpaceImage *sima, struct ARegion *ar, struct Scene *scene, struct Object *obedit, struct Object *obact); /* uvedit_buttons.c */ void ED_uvedit_buttons_register(struct ARegionType *art); |