← 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/WXEdge.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/WXEdge.h
95
95
        {
96
96
                return _curvatures;
97
97
        }
 
98
 
 
99
#ifdef WITH_CXX_GUARDEDALLOC
 
100
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXVertex")
 
101
#endif
 
102
 
98
103
};
99
104
 
100
105
 
197
202
        {
198
203
                _order = i;
199
204
        }
 
205
 
 
206
#ifdef WITH_CXX_GUARDEDALLOC
 
207
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXEdge")
 
208
#endif
 
209
 
200
210
};
201
211
 
202
212
/**********************************
686
696
                        (*wxf)->userdata = NULL;
687
697
                }
688
698
        }
 
699
 
 
700
#ifdef WITH_CXX_GUARDEDALLOC
 
701
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXFace")
 
702
#endif
 
703
 
689
704
};
690
705
 
691
706
 
782
797
                }
783
798
        }
784
799
        /*! accessors */
 
800
 
 
801
#ifdef WITH_CXX_GUARDEDALLOC
 
802
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:WXShape")
 
803
#endif
 
804
 
785
805
};
786
806
 
787
807
/*