History

Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples

Howard Stearns committed 11 years ago

Commit 4b4bf9f2 parents ae73e68 afb09e869 files · +318 −306Browse files

Showing the changes to interface/src/Application.cpp (1 of 69 files). Show all

Unified · Split

interface/src/Application.cpp+2−2
@@ -1974,7 +1974,7 @@ void Application::toggleFaceTrackerMute() { · 1973 unmodified lines
1974}1974}
1975 1975
1976bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {1976bool Application::exportEntities(const QString& filename, const QVector<EntityItemID>& entityIDs) {
1977 QVector<EntityItem*> entities;1977 QVector<EntityItemPointer> entities;
1978 1978
1979 auto entityTree = _entities.getTree();1979 auto entityTree = _entities.getTree();
1980 EntityTree exportTree;1980 EntityTree exportTree;
@@ -2015,7 +2015,7 @@ bool Application::exportEntities(const QString& filename, const QVector<EntityIt · 34 unmodified lines
2015}2015}
2016 2016
2017bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {2017bool Application::exportEntities(const QString& filename, float x, float y, float z, float scale) {
2018 QVector<EntityItem*> entities;2018 QVector<EntityItemPointer> entities;
2019 _entities.getTree()->findEntities(AACube(glm::vec3(x, y, z), scale), entities);2019 _entities.getTree()->findEntities(AACube(glm::vec3(x, y, z), scale), entities);
2020 2020
2021 if (entities.size() > 0) {2021 if (entities.size() > 0) {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t