X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fglsl%2Fsyntax.cpp;h=cb77419763645be5987842b9bd7d654eb30e13c5;hp=d7eec3da4bf680cbf4125d0cb747feccd54af38d;hb=041ba4b1acd55337239c5ce24cc310118c621206;hpb=cd01b904990d306eadd120f306b1d0ceb4d8f5c8

diff --git a/source/glsl/syntax.cpp b/source/glsl/syntax.cpp
index d7eec3da..cb774197 100644
--- a/source/glsl/syntax.cpp
+++ b/source/glsl/syntax.cpp
@@ -272,11 +272,24 @@ void ImageTypeDeclaration::visit(NodeVisitor &visitor)
 }
 
 
-StructDeclaration::StructDeclaration()
+StructDeclaration::StructDeclaration():
+	interface_block(0)
 {
 	members.use_braces = true;
 }
 
+StructDeclaration::StructDeclaration(const StructDeclaration &other):
+	TypeDeclaration(other),
+	members(other.members),
+	interface_block(0)
+{ }
+
+StructDeclaration::~StructDeclaration()
+{
+	if(interface_block && interface_block->struct_declaration==this)
+		interface_block->struct_declaration = 0;
+}
+
 void StructDeclaration::visit(NodeVisitor &visitor)
 {
 	visitor.visit(*this);
@@ -321,10 +334,10 @@ void VariableDeclaration::visit(NodeVisitor &visitor)
 
 InterfaceBlock::InterfaceBlock():
 	array(false),
+	type_declaration(0),
+	struct_declaration(0),
 	linked_block(0)
-{
-	members.use_braces = true;
-}
+{ }
 
 InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
 	Statement(other),
@@ -333,6 +346,8 @@ InterfaceBlock::InterfaceBlock(const InterfaceBlock &other):
 	members(other.members),
 	instance_name(other.instance_name),
 	array(other.array),
+	type_declaration(0),
+	struct_declaration(0),
 	linked_block(0)
 { }
 
@@ -340,6 +355,8 @@ InterfaceBlock::~InterfaceBlock()
 {
 	if(linked_block && linked_block->linked_block==this)
 		linked_block->linked_block = 0;
+	if(struct_declaration && struct_declaration->interface_block==this)
+		struct_declaration->interface_block = 0;
 }
 
 void InterfaceBlock::visit(NodeVisitor &visitor)