From 50ba154615c64ba90a3ddbb6ba3c25f2ed29e4de Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Wed, 6 May 2015 17:04:01 +0200 Subject: [PATCH] Correctly wire setDrawZones --- examples/libraries/zoneOverlayManager.js | 1 + libraries/entities-renderer/src/RenderableZoneEntityItem.cpp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/examples/libraries/zoneOverlayManager.js b/examples/libraries/zoneOverlayManager.js index aac3af119b..92694f8e07 100644 --- a/examples/libraries/zoneOverlayManager.js +++ b/examples/libraries/zoneOverlayManager.js @@ -35,6 +35,7 @@ ZoneOverlayManager = function(isEntityFunc, entityAddedFunc, entityRemovedFunc, this.setVisible = function(isVisible) { if (visible != isVisible) { visible = isVisible; + Entities.setDrawZoneBoundaries(visible); for (var id in entityOverlays) { Overlays.editOverlay(entityOverlays[id].solid, { visible: visible }); Overlays.editOverlay(entityOverlays[id].outline, { visible: visible }); diff --git a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp index 6e4f4bae53..d9bc0f0b4a 100644 --- a/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableZoneEntityItem.cpp @@ -90,7 +90,7 @@ void RenderableZoneEntityItem::updateGeometry() { } void RenderableZoneEntityItem::render(RenderArgs* args) { - if (_drawZoneBoundaries || true) { + if (_drawZoneBoundaries) { switch (getShapeType()) { case SHAPE_TYPE_COMPOUND: { updateGeometry();