git-svn-id: svn://db.shs.com.ru/libs@639 a8b55f48-bf90-11e4-a774-851b48703e85

2019-12-02 21:09:33 +00:00
parent 35668c13fc
commit c2100ecbc0
8 changed files with 61 additions and 20 deletions
--- a/qglengine/renderer_service.cpp
+++ b/qglengine/renderer_service.cpp
@@ -230,12 +230,18 @@ bool RendererService::calculateCenter() {
 			o->calculateBoundingBox();
 			bb |= o->boundingBox();
 		}
-		if (!bb.isEmpty())
+		if (!bb.isEmpty()) {
 			selection_center = bb.center();
+		}
 	}
 	axis_mat = QMatrix4x4();
-	if ((sol.size() == 1) && (current_action != haMove)) {
-		axis_mat = parentRotationMatrix(sol[0]);
+	if ((sol.size() == 1)) {
+		if (current_action == haMove) {
+			if (sol[0]->selected_aim)
+				selection_center = ((AimedObject*)sol[0])->worldAim();
+		} else {
+			axis_mat = parentRotationMatrix(sol[0]);
+		}
 	}
 	return true;
 }