X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fresolve.cpp;h=02f224d66b4453d2469a2638e0ab0453d2cd6c4a;hp=05aead3c5fa369f55529c02c05c34fe7a6997dba;hb=03d9003072e85c934f5624329fb4a34db8763db2;hpb=f2e54dc47d0ddba2b1ca582e8c8feb64ccfcb270

diff --git a/source/glsl/resolve.cpp b/source/glsl/resolve.cpp
index 05aead3c..02f224d6 100644
--- a/source/glsl/resolve.cpp
+++ b/source/glsl/resolve.cpp
@@ -279,21 +279,18 @@ void VariableResolver::visit(MemberAccess &memacc)
 	TraversingVisitor::visit(memacc);
 
 	VariableDeclaration *declaration = 0;
+	int index = -1;
 	if(StructDeclaration *strct = dynamic_cast<StructDeclaration *>(memacc.left->type))
 	{
 		map<string, VariableDeclaration *>::iterator i = strct->members.variables.find(memacc.member);
 		if(i!=strct->members.variables.end())
 		{
 			declaration = i->second;
+			for(NodeList<Statement>::const_iterator j=strct->members.body.begin(); (j!=strct->members.body.end() && j->get()!=i->second); ++j)
+				++index;
 
 			if(record_target)
-			{
-				unsigned index = 0;
-				for(NodeList<Statement>::const_iterator j=strct->members.body.begin(); (j!=strct->members.body.end() && j->get()!=i->second); ++j)
-					++index;
-
 				add_to_chain(Assignment::Target::MEMBER, index);
-			}
 		}
 	}
 	else if(BasicTypeDeclaration *basic = dynamic_cast<BasicTypeDeclaration *>(memacc.left->type))
@@ -324,8 +321,9 @@ void VariableResolver::visit(MemberAccess &memacc)
 		}
 	}
 
-	r_any_resolved |= (declaration!=memacc.declaration);
+	r_any_resolved |= (declaration!=memacc.declaration || index!=memacc.index);
 	memacc.declaration = declaration;
+	memacc.index = index;
 }
 
 void VariableResolver::visit(Swizzle &swizzle)