X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fsynfigapp%2Finstance.cpp;h=c3c542bb357394f1449da25e6192c409f063bd8a;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=8bdfc3d9ef31a8d13bd14058dbbcfa2b2a362cef;hpb=c2813b4d63804cac9b4067146a9e6eca717cb3e4;p=synfig.git

diff --git a/synfig-studio/trunk/src/synfigapp/instance.cpp b/synfig-studio/trunk/src/synfigapp/instance.cpp
index 8bdfc3d..c3c542b 100644
--- a/synfig-studio/trunk/src/synfigapp/instance.cpp
+++ b/synfig-studio/trunk/src/synfigapp/instance.cpp
@@ -6,7 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2007 Chris Moore
+**	Copyright (c) 2007, 2008 Chris Moore
 **
 **	This package is free software; you can redistribute it and/or
 **	modify it under the terms of the GNU General Public License as
@@ -38,6 +38,11 @@
 #include <synfig/valuenode_composite.h>
 #include <synfig/valuenode_radialcomposite.h>
 #include <synfig/valuenode_reference.h>
+#include <synfig/valuenode_greyed.h>
+#include <synfig/valuenode_blinecalctangent.h>
+#include <synfig/valuenode_blinecalcvertex.h>
+#include <synfig/valuenode_blinecalcwidth.h>
+#include <synfig/valuenode_scale.h>
 #include <map>
 
 #include "general.h"
@@ -66,7 +71,11 @@ synfigapp::is_editable(synfig::ValueNode::Handle value_node)
 		|| ValueNode_Animated::Handle::cast_dynamic(value_node)
 		|| ValueNode_Composite::Handle::cast_dynamic(value_node)
 		|| ValueNode_RadialComposite::Handle::cast_dynamic(value_node)
-		|| ValueNode_Reference::Handle::cast_dynamic(value_node)
+		||(ValueNode_Reference::Handle::cast_dynamic(value_node) && !ValueNode_Greyed::Handle::cast_dynamic(value_node))
+		|| ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_node)
+		|| ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_node)
+		|| ValueNode_BLineCalcWidth::Handle::cast_dynamic(value_node)
+		|| ValueNode_Scale::Handle::cast_dynamic(value_node)
 	)
 		return true;
 	return false;
@@ -118,8 +127,10 @@ Instance::set_file_name(const synfig::String &name)
 Instance::~Instance()
 {
 	instance_map_.erase(canvas_);
-	synfig::info("studio::Instance::~Instance(): Deleted");
-} // END of studio::Instance::~Instance()
+
+	if (getenv("SYNFIG_DEBUG_DESTRUCTORS"))
+		synfig::info("Instance::~Instance(): Deleted");
+}
 
 handle<CanvasInterface>
 Instance::find_canvas_interface(synfig::Canvas::Handle canvas)