History

Merge branch 'master' into feature/pole-vector

Anthony J. Thibault committed 9 years ago

Commit 2dcca212 parents 0f51236 4929939249 files · +3248 −1860Browse files

Showing the changes to libraries/render-utils/src/Model.cpp (1 of 249 files). Show all

Unified · Split

libraries/render-utils/src/Model.cpp+2−1
@@ -9,6 +9,8 @@ · 8 unmodified lines
99 // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
1010 //
1111
12+#include "Model.h"
13+
1214 #include <QMetaType>
1315 #include <QRunnable>
1416 #include <QThreadPool>
@@ -24,7 +26,6 @@ · 9 unmodified lines
2426
2527 #include "AbstractViewStateInterface.h"
2628 #include "MeshPartPayload.h"
27−#include "Model.h"
2829
2930 #include "RenderUtilsLogging.h"
3031 #include <Trace.h>

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