← 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/Functions1D.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/Functions1D.h
125
125
        IntegrationType _integration;
126
126
 
127
127
#ifdef WITH_CXX_GUARDEDALLOC
128
 
public:
129
128
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction1D")
130
129
#endif
131
130
};
172
171
        IntegrationType _integration;
173
172
 
174
173
#ifdef WITH_CXX_GUARDEDALLOC
175
 
public:
176
174
        MEM_CXX_CLASS_ALLOC_FUNCS("Freestyle:UnaryFunction1D_void")
177
175
#endif
178
176
};
379
377
 
380
378
// ZDiscontinuityF1D
381
379
/*! Returns a real giving the distance between and Interface1D and the shape that lies behind (occludee).
382
 
 *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no oject is occluded
 
380
 *  This distance is evaluated in the camera space and normalized between 0 and 1. Therefore, if no object is occluded
383
381
 *  by the shape to which the Interface1D belongs to, 1 is returned.
384
382
 */
385
383
class LIB_VIEW_MAP_EXPORT ZDiscontinuityF1D : public UnaryFunction1D<real>