diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-13 16:45:08 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-03-13 16:45:08 +0300 |
| commit | 47ce2c5574eca221f56420c82d34933d48be0cd5 (patch) | |
| tree | 6414838d83927609f3987b0f30c1caba21f33846 /source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h | |
| parent | ec3eec1ac5d1d56ca21047d0d3b4dd78ada4b030 (diff) | |
| parent | fc3de690ac0603b566998b8a68b3c38d7767c9b6 (diff) | |
Merge branch 'master' into asset-experiments
Diffstat (limited to 'source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h')
| -rw-r--r-- | source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h index d63557f5cda..2c58cc32da9 100644 --- a/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h +++ b/source/blender/freestyle/intern/view_map/AverageAreaGridDensityProvider.h @@ -55,10 +55,10 @@ public: AverageAreaGridDensityProviderFactory(real sizeFactor); ~AverageAreaGridDensityProviderFactory(); - auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const real proscenium[4]); - auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, - const GridHelpers::Transform& transform); - auto_ptr<GridDensityProvider> newGridDensityProvider(OccluderSource& source); + AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const real proscenium[4]); + AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource& source, const BBox<Vec3r>& bbox, + const GridHelpers::Transform& transform); + AutoPtr<GridDensityProvider> newGridDensityProvider(OccluderSource& source); protected: real sizeFactor; |