From 5e8277e923c5545a15bae7c740ab6afaa597a59f Mon Sep 17 00:00:00 2001 From: jackpoz Date: Fri, 22 Aug 2014 16:58:23 +0200 Subject: Core/Dependencies: Update G3D to v9.0 r4036 --- dep/g3dlite/source/BumpMapPreprocess.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'dep/g3dlite/source/BumpMapPreprocess.cpp') 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; -- cgit v1.2.3