- make subfile references subject to position transformation again

Fri, 10 Jan 2014 15:31:05 +0200

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Fri, 10 Jan 2014 15:31:05 +0200
changeset 615
b9073bddec0d
parent 614
aac6f0021070
child 616
92170185dbb6

- make subfile references subject to position transformation again

src/gui_editactions.cc file | annotate | diff | comparison | revisions
--- a/src/gui_editactions.cc	Fri Jan 10 15:28:29 2014 +0200
+++ b/src/gui_editactions.cc	Fri Jan 10 15:31:05 2014 +0200
@@ -471,8 +471,6 @@
 				 cosangle = cos (angle),
 				 sinangle = sin (angle);
 
-	log ("rotpoint: %1", rotpoint);
-
 	// ref: http://en.wikipedia.org/wiki/Transformation_matrix#Rotation_2
 	Matrix transform (
 	{
@@ -500,20 +498,20 @@
 				rotateVertex (v, rotpoint, transform);
 				obj->setVertex (i, v);
 			}
-		} elif (obj->hasMatrix())
+		}
+		elif (obj->hasMatrix())
 		{
 			LDMatrixObject* mo = dynamic_cast<LDMatrixObject*> (obj);
 
 			// Transform the position
-			/*
-			vertex v = mo->getPosition();
+			Vertex v = mo->getPosition();
 			rotateVertex (v, rotpoint, transform);
 			mo->setPosition (v);
-			*/
 
 			// Transform the matrix
 			mo->setTransform (transform * mo->getTransform());
-		} elif (obj->getType() == LDObject::EVertex)
+		}
+		elif (obj->getType() == LDObject::EVertex)
 		{
 			LDVertex* vert = static_cast<LDVertex*> (obj);
 			Vertex v = vert->pos;

mercurial