From c555a9646a68e823c8261e905fc4c3a11855c5c6 Mon Sep 17 00:00:00 2001
From: Marius Kintel <marius@kintel.net>
Date: Fri, 2 Sep 2011 02:32:07 +0200
Subject: change: Always use r as fallback variable if either of r1 or r2 are
 missing


diff --git a/src/primitives.cc b/src/primitives.cc
index 5502192..0da8fba 100644
--- a/src/primitives.cc
+++ b/src/primitives.cc
@@ -180,8 +180,7 @@ AbstractNode *PrimitiveModule::evaluate(const Context *ctx, const ModuleInstanti
 		Value r, r1, r2;
 		r1 = c.lookup_variable("r1");
 		r2 = c.lookup_variable("r2");
-		if (r1.type != Value::NUMBER && r2.type != Value::NUMBER)
-			r = c.lookup_variable("r", true); // silence warning since r has no default value
+		r = c.lookup_variable("r", true); // silence warning since r has no default value
 		Value center = c.lookup_variable("center");
 		if (h.type == Value::NUMBER) {
 			node->h = h.num;
-- 
cgit v0.10.1