Added missing change for the merge

This commit is contained in:
Alexander Bock
2014-09-13 12:10:55 +02:00
parent ce10dea96e
commit 1101b656b8

View File

@@ -173,10 +173,7 @@ void InteractionHandler::distance(const PowerScaledScalar &distance) {
lockControls();
psc relative = camera_->position();
psc origin;
if(node_) {
origin = node_->worldPosition();
}
const psc origin = (node_) ? node_->worldPosition() : psc();
psc relative_origin_coordinate = relative - origin;
const glm::vec3 dir(relative_origin_coordinate.direction());