diff options
| author | jackpoz <giacomopoz@gmail.com> | 2014-08-22 16:58:23 +0200 |
|---|---|---|
| committer | jackpoz <giacomopoz@gmail.com> | 2014-08-22 21:00:56 +0200 |
| commit | 5e8277e923c5545a15bae7c740ab6afaa597a59f (patch) | |
| tree | 4cf5212c080588a7e868ee60134fc7fff51e400a /dep/g3dlite/include/G3D/BumpMapPreprocess.h | |
| parent | a63aa858dcb400eafb97eed1f590e34c27d934a4 (diff) | |
Core/Dependencies: Update G3D to v9.0 r4036
Diffstat (limited to 'dep/g3dlite/include/G3D/BumpMapPreprocess.h')
| -rw-r--r-- | dep/g3dlite/include/G3D/BumpMapPreprocess.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/g3dlite/include/G3D/BumpMapPreprocess.h b/dep/g3dlite/include/G3D/BumpMapPreprocess.h index 955f99e61b2..a2ddaf1901d 100644 --- a/dep/g3dlite/include/G3D/BumpMapPreprocess.h +++ b/dep/g3dlite/include/G3D/BumpMapPreprocess.h @@ -6,7 +6,7 @@ \created 2010-01-28 \edited 2010-01-28 - Copyright 2000-2010, Morgan McGuire. + Copyright 2000-2012, Morgan McGuire. All rights reserved. */ @@ -20,7 +20,7 @@ class Any; /** Not in the BumpMap class to avoid a circular dependency between Texture and BumpMap. -G3D::GImage::computeNormalMap(). +G3D::Image::computeNormalMap(). */ class BumpMapPreprocess { public: @@ -46,7 +46,7 @@ public: BumpMapPreprocess(const Any& any); - operator Any() const; + Any toAny() const; bool operator==(const BumpMapPreprocess& other) const { return |