← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/windowmanager/intern/wm.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/windowmanager/intern/wm.c
156
156
{
157
157
        wmOperator *op;
158
158
        
159
 
        while ((op = wm->operators.first)) {
160
 
                BLI_remlink(&wm->operators, op);
 
159
        while ((op = BLI_pophead(&wm->operators))) {
161
160
                WM_operator_free(op);
162
161
        }
163
162
        
226
225
/* called on initialize WM_init() */
227
226
void WM_uilisttype_init(void)
228
227
{
229
 
        uilisttypes_hash = BLI_ghash_str_new("uilisttypes_hash gh");
 
228
        uilisttypes_hash = BLI_ghash_str_new_ex("uilisttypes_hash gh", 16);
230
229
}
231
230
 
232
231
void WM_uilisttype_free(void)
279
278
/* called on initialize WM_init() */
280
279
void WM_menutype_init(void)
281
280
{
282
 
        menutypes_hash = BLI_ghash_str_new("menutypes_hash gh");
 
281
        /* reserve size is set based on blender default setup */
 
282
        menutypes_hash = BLI_ghash_str_new_ex("menutypes_hash gh", 512);
283
283
}
284
284
 
285
285
void WM_menutype_free(void)
413
413
        if (wm->autosavetimer)
414
414
                wm_autosave_timer_ended(wm);
415
415
 
416
 
        while ((win = wm->windows.first)) {
417
 
                BLI_remlink(&wm->windows, win);
 
416
        while ((win = BLI_pophead(&wm->windows))) {
418
417
                win->screen = NULL; /* prevent draw clear to use screen */
419
418
                wm_draw_window_clear(win);
420
419
                wm_window_free(C, wm, win);
421
420
        }
422
421
        
423
 
        while ((op = wm->operators.first)) {
424
 
                BLI_remlink(&wm->operators, op);
 
422
        while ((op = BLI_pophead(&wm->operators))) {
425
423
                WM_operator_free(op);
426
424
        }
427
425
 
428
 
        while ((keyconf = wm->keyconfigs.first)) {
429
 
                BLI_remlink(&wm->keyconfigs, keyconf);
 
426
        while ((keyconf = BLI_pophead(&wm->keyconfigs))) {
430
427
                WM_keyconfig_free(keyconf);
431
428
        }
432
429