X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fglsl%2Fvisitor.cpp;h=808bcfa52dfc3757e70ea16ba4ec1fe451b75fe8;hb=d3a41542c4982d6df08b5e6f969267f9c8889f9f;hp=fd9e9792b303cac8060d5b7b14b6f2fd74576b36;hpb=a4cd67f1c9f1f375bacacfbb421d40f78a22644b;p=libs%2Fgl.git

diff --git a/source/glsl/visitor.cpp b/source/glsl/visitor.cpp
index fd9e9792..808bcfa5 100644
--- a/source/glsl/visitor.cpp
+++ b/source/glsl/visitor.cpp
@@ -88,6 +88,8 @@ void TraversingVisitor::visit(VariableDeclaration &var)
 
 void TraversingVisitor::visit(InterfaceBlock &iface)
 {
+	if(iface.layout)
+		iface.layout->visit(*this);
 	if(iface.members)
 		iface.members->visit(*this);
 }
@@ -191,7 +193,7 @@ void NodeRemover::visit(InterfaceBlock &iface)
 {
 	if(to_remove->count(&iface))
 	{
-		remove_from_map(stage->interface_blocks, iface.interface+iface.name, iface);
+		remove_from_map(stage->interface_blocks, iface.interface+iface.block_name, iface);
 		if(!iface.instance_name.empty())
 			remove_from_map(stage->interface_blocks, "_"+iface.instance_name, iface);
 	}