← 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/winged_edge/WEdge.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/winged_edge/WEdge.h
245
245
                virtual void increment();
246
246
 
247
247
#ifdef WITH_CXX_GUARDEDALLOC
248
 
        public:
249
248
                MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:incoming_edge_iterator")
250
249
#endif
251
250
        };
330
329
                }
331
330
 
332
331
#ifdef WITH_CXX_GUARDEDALLOC
333
 
        public:
334
332
                MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WVertex:face_iterator")
335
333
#endif
336
334
        };
1282
1280
                                WFace *face);
1283
1281
 
1284
1282
#ifdef WITH_CXX_GUARDEDALLOC
1285
 
public:
1286
1283
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WShape")
1287
1284
#endif
1288
1285
};
1327
1324
        vector<WShape *> _wshapes;
1328
1325
 
1329
1326
#ifdef WITH_CXX_GUARDEDALLOC
1330
 
public:
1331
1327
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WingedEdge")
1332
1328
#endif
1333
1329
};