History

Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping

David Back committed 8 years ago

Commit 96d2ba62 parents 0e53fa3 156f1dc19 files · +353 −84Browse files

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

Unified · Split

interface/src/Application.cpp+8−0
@@ -1866,6 +1866,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 1865 unmodified lines
1866 });1866 });
1867 1867
1868 EntityTree::setAddMaterialToEntityOperator([this](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {1868 EntityTree::setAddMaterialToEntityOperator([this](const QUuid& entityID, graphics::MaterialLayer material, const std::string& parentMaterialName) {
1869 if (_aboutToQuit) {
1870 return false;
1871 }
1872
1869 // try to find the renderable1873 // try to find the renderable
1870 auto renderable = getEntities()->renderableForEntityId(entityID);1874 auto renderable = getEntities()->renderableForEntityId(entityID);
1871 if (renderable) {1875 if (renderable) {
@@ -1881,6 +1885,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo · 9 unmodified lines
1881 return false;1885 return false;
1882 });1886 });
1883 EntityTree::setRemoveMaterialFromEntityOperator([this](const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName) {1887 EntityTree::setRemoveMaterialFromEntityOperator([this](const QUuid& entityID, graphics::MaterialPointer material, const std::string& parentMaterialName) {
1888 if (_aboutToQuit) {
1889 return false;
1890 }
1891
1884 // try to find the renderable1892 // try to find the renderable
1885 auto renderable = getEntities()->renderableForEntityId(entityID);1893 auto renderable = getEntities()->renderableForEntityId(entityID);
1886 if (renderable) {1894 if (renderable) {