Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 04:03:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership

Browse source
This commit is contained in:
Seth Alves 2015-07-01 07:33:29 -07:00
commit b7e9056c04
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/describe-settings.json
View file

@ -484,7 +484,7 @@
"type": "checkbox",
"label": "Edit Logging",
"help": "Logging of all edits to entities",
"default": true,
"default": false,
"advanced": true
},
{

1
libraries/entities-renderer/src/RenderableLineEntityItem.cpp
View file

@ -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());