aboutsummaryrefslogtreecommitdiff
path: root/dep/g3dlite/source/BumpMapPreprocess.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'dep/g3dlite/source/BumpMapPreprocess.cpp')
-rw-r--r--dep/g3dlite/source/BumpMapPreprocess.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/dep/g3dlite/source/BumpMapPreprocess.cpp b/dep/g3dlite/source/BumpMapPreprocess.cpp
index 20281caf8cb..df5a23c13a6 100644
--- a/dep/g3dlite/source/BumpMapPreprocess.cpp
+++ b/dep/g3dlite/source/BumpMapPreprocess.cpp
@@ -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.
*/
#include "G3D/BumpMapPreprocess.h"
@@ -17,7 +17,7 @@ namespace G3D {
BumpMapPreprocess::BumpMapPreprocess(const Any& any) {
*this = BumpMapPreprocess();
- for (Any::AnyTable::Iterator it = any.table().begin(); it.hasMore(); ++it) {
+ for (Any::AnyTable::Iterator it = any.table().begin(); it.isValid(); ++it) {
const std::string& key = toLower(it->key);
if (key == "lowpassfilter") {
lowPassFilter = it->value;
@@ -32,7 +32,7 @@ BumpMapPreprocess::BumpMapPreprocess(const Any& any) {
}
-BumpMapPreprocess::operator Any() const {
+Any BumpMapPreprocess::toAny() const {
Any any(Any::TABLE, "BumpMapPreprocess");
any["lowPassFilter"] = lowPassFilter;
any["zExtentPixels"] = zExtentPixels;