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

« back to all changes in this revision

Viewing changes to source/blender/freestyle/intern/scene_graph/IndexedFaceSet.h

  • 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:
312
312
        unsigned _TISize;
313
313
 
314
314
        unsigned int _displayList;
 
315
 
 
316
#ifdef WITH_CXX_GUARDEDALLOC
 
317
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:IndexedFaceSet")
 
318
#endif
 
319
 
315
320
};
316
321
 
317
322
} /* namespace Freestyle */