← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/editors/physics/physics_pointcache.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/editors/physics/physics_pointcache.c
126
126
         * the job system soon anyways. */
127
127
        if (win) {
128
128
                baker.progressbar = (void (*)(void *, int))WM_cursor_time;
129
 
                baker.progressend = (void (*)(void *))WM_cursor_restore;
 
129
                baker.progressend = (void (*)(void *))WM_cursor_modal_restore;
130
130
                baker.progresscontext = win;
131
131
        }
132
132
        else {
230
230
         * the job system soon anyways. */
231
231
        if (win) {
232
232
                baker.progressbar = (void (*)(void *, int))WM_cursor_time;
233
 
                baker.progressend = (void (*)(void *))WM_cursor_restore;
 
233
                baker.progressend = (void (*)(void *))WM_cursor_modal_restore;
234
234
                baker.progresscontext = win;
235
235
        }
236
236
        else {