← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to source/blender/editors/space_outliner/space_outliner.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/space_outliner/space_outliner.c
37
37
#include "BLI_blenlib.h"
38
38
#include "BLI_math.h"
39
39
#include "BLI_utildefines.h"
 
40
#include "BLI_mempool.h"
 
41
#include "BLI_ghash.h"
40
42
 
41
43
#include "BKE_context.h"
42
44
#include "BKE_screen.h"
43
45
#include "BKE_scene.h"
 
46
#include "BKE_treehash.h"
44
47
 
45
48
#include "ED_space_api.h"
46
49
#include "ED_screen.h"
142
145
 
143
146
        UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fmval[0], &fmval[1]);
144
147
 
 
148
        if (!ELEM4(soops->outlinevis, SO_ALL_SCENES, SO_CUR_SCENE, SO_VISIBLE, SO_GROUPS)) {
 
149
                return FALSE;
 
150
        }
 
151
 
145
152
        if (drag->type == WM_DRAG_ID) {
146
153
                ID *id = (ID *)drag->poin;
147
154
                if (GS(id->name) == ID_OB) {
426
433
        
427
434
        outliner_free_tree(&soutliner->tree);
428
435
        if (soutliner->treestore) {
429
 
                if (soutliner->treestore->data) MEM_freeN(soutliner->treestore->data);
430
 
                MEM_freeN(soutliner->treestore);
431
 
        }
432
 
        
 
436
                BLI_mempool_destroy(soutliner->treestore);
 
437
        }
 
438
        if (soutliner->treehash) {
 
439
                BKE_treehash_free(soutliner->treehash);
 
440
        }
433
441
}
434
442
 
435
443
/* spacetype; init callback */
445
453
 
446
454
        soutlinern->tree.first = soutlinern->tree.last = NULL;
447
455
        soutlinern->treestore = NULL;
 
456
        soutlinern->treehash = NULL;
448
457
        
449
458
        return (SpaceLink *)soutlinern;
450
459
}