Fixed conflicts after merge with branch et_perpsective_camera

This commit is contained in:
Enrico Turri
2019-06-24 11:08:42 +02:00
14 changed files with 471 additions and 253 deletions

View File

@@ -13,6 +13,8 @@
#define ENABLE_RENDER_SELECTION_CENTER 0
// Shows an imgui dialog with render related data
#define ENABLE_RENDER_STATISTICS 0
// Shows an imgui dialog with camera related data
#define ENABLE_CAMERA_STATISTICS 1
//====================