diff options
author | Matt Ebb <matt@mke3.net> | 2010-03-30 09:52:05 +0400 |
---|---|---|
committer | Matt Ebb <matt@mke3.net> | 2010-03-30 09:52:05 +0400 |
commit | b09ee4923d4066ec032fb3105355c79618352b46 (patch) | |
tree | 1f54c5a497ef48e08790de6b2da394cb02f93e01 /source/blender/editors/transform/transform_generics.c | |
parent | 5089663962a14a3cc21f342db66a0c157bfd7dfc (diff) |
Fix [#21711] Position of 2d cursor is not displayed correctly and cannot be set
in uv/image editor properties panel
Note: Moved UV editor 2d cursor to SpaceImage rather than View2d, so it's
more accessible to RNA.
Diffstat (limited to 'source/blender/editors/transform/transform_generics.c')
-rw-r--r-- | source/blender/editors/transform/transform_generics.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/source/blender/editors/transform/transform_generics.c b/source/blender/editors/transform/transform_generics.c index 326fcce3173..1fd189e8b52 100644 --- a/source/blender/editors/transform/transform_generics.c +++ b/source/blender/editors/transform/transform_generics.c @@ -1223,13 +1223,18 @@ void calculateCenterCursor2D(TransInfo *t) { View2D *v2d= t->view; float aspx=1.0, aspy=1.0; + float *cursor; - if(t->spacetype==SPACE_IMAGE) /* only space supported right now but may change */ - ED_space_image_uv_aspect(t->sa->spacedata.first, &aspx, &aspy); + if(t->spacetype==SPACE_IMAGE) { + SpaceImage *sima= (SpaceImage *)t->sa->spacedata.first; + /* only space supported right now but may change */ + ED_space_image_uv_aspect(sima, &aspx, &aspy); + cursor = sima->cursor; + } if (v2d) { - t->center[0] = v2d->cursor[0] * aspx; - t->center[1] = v2d->cursor[1] * aspy; + t->center[0] = cursor[0] * aspx; + t->center[1] = cursor[1] * aspy; } calculateCenter2D(t); |