← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source/blender/freestyle/intern/view_map/ViewMapIterators.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:
source/blender/freestyle/intern/view_map/ViewMapIterators.h
219
219
                }
220
220
                return 0;
221
221
        }
 
222
 
 
223
#ifdef WITH_CXX_GUARDEDALLOC
 
224
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:orientedViewEdgeIterator")
 
225
#endif
 
226
 
222
227
};
223
228
 
224
229
}  // ViewVertexInternal namespace
390
395
        FEdge *_previous_edge;
391
396
        FEdge *_next_edge;
392
397
        float _t; // curvilinear abscissa
 
398
 
 
399
#ifdef WITH_CXX_GUARDEDALLOC
 
400
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:SVertexIterator")
 
401
#endif
 
402
 
393
403
};
394
404
 
395
405
 
561
571
        bool _orientation;
562
572
        ViewEdge *_edge;
563
573
        ViewEdge *_begin;
 
574
 
 
575
#ifdef WITH_CXX_GUARDEDALLOC
 
576
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:ViewEdgeIterator")
 
577
#endif
 
578
 
564
579
};
565
580
 
566
581
} // end of namespace ViewEdgeInternal