From 843ab6d5e3480b3332ad985b1dd4414bac448c27 Mon Sep 17 00:00:00 2001 From: ericrius1 Date: Mon, 29 Jun 2015 11:08:09 -0700 Subject: [PATCH 1/2] line entities can now be properly rotated using rotation property --- libraries/entities-renderer/src/RenderableLineEntityItem.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp index 4b94992d59..6eb575814a 100644 --- a/libraries/entities-renderer/src/RenderableLineEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableLineEntityItem.cpp @@ -45,6 +45,7 @@ void RenderableLineEntityItem::render(RenderArgs* args) { gpu::Batch& batch = *args->_batch; Transform transform = Transform(); transform.setTranslation(getPosition()); + transform.setRotation(getRotation()); batch.setModelTransform(transform); batch._glLineWidth(getLineWidth()); From a736d0d901fd200968217575a5be065e8af27b7a Mon Sep 17 00:00:00 2001 From: Howard Stearns Date: Mon, 29 Jun 2015 11:33:55 -0700 Subject: [PATCH 2/2] Initial value false for domain-server wantEditLogging (used by assignment clients). --- domain-server/resources/describe-settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/domain-server/resources/describe-settings.json b/domain-server/resources/describe-settings.json index e02fa22246..ff2f4cf683 100644 --- a/domain-server/resources/describe-settings.json +++ b/domain-server/resources/describe-settings.json @@ -484,7 +484,7 @@ "type": "checkbox", "label": "Edit Logging", "help": "Logging of all edits to entities", - "default": true, + "default": false, "advanced": true }, {