diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-07 02:21:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-07 02:21:41 +0400 |
| commit | b0f9d3a8afe9aa6acac2911389d003c327e52e56 (patch) | |
| tree | f6a94e2660b73bb9eccece3396d60d61bc964f4e /source/blender/editors/space_image | |
| parent | a36ccba3a8bfcdb9415e0d27735ebd36eec8b16a (diff) | |
| parent | 297a21c39a9b33337b168b32adf0538b11d56510 (diff) | |
svn merge ^/trunk/blender -r43918:43934
Diffstat (limited to 'source/blender/editors/space_image')
| -rw-r--r-- | source/blender/editors/space_image/image_ops.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_image/space_image.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c index ea58b4aa737..e1fe3788d05 100644 --- a/source/blender/editors/space_image/image_ops.c +++ b/source/blender/editors/space_image/image_ops.c @@ -594,7 +594,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op)) /* retrieve state */ sima= CTX_wm_space_image(C); ar= CTX_wm_region(C); - scene= (Scene*)CTX_data_scene(C); + scene= CTX_data_scene(C); obedit= CTX_data_edit_object(C); ima= ED_space_image(sima); @@ -1445,7 +1445,7 @@ static int image_new_exec(bContext *C, wmOperator *op) /* retrieve state */ sima= CTX_wm_space_image(C); - scene= (Scene*)CTX_data_scene(C); + scene= CTX_data_scene(C); obedit= CTX_data_edit_object(C); RNA_string_get(op->ptr, "name", name); diff --git a/source/blender/editors/space_image/space_image.c b/source/blender/editors/space_image/space_image.c index 3d97972c829..4d74322fc56 100644 --- a/source/blender/editors/space_image/space_image.c +++ b/source/blender/editors/space_image/space_image.c @@ -580,7 +580,7 @@ static void image_refresh(const bContext *C, ScrArea *UNUSED(sa)) ima= ED_space_image(sima); if(sima->iuser.flag & IMA_ANIM_ALWAYS) - BKE_image_user_calc_frame(&sima->iuser, CTX_data_scene(C)->r.cfra, 0); + BKE_image_user_calc_frame(&sima->iuser, scene->r.cfra, 0); /* check if we have to set the image from the editmesh */ if(ima && (ima->source==IMA_SRC_VIEWER || sima->pin)); |