Merge remote-tracking branch 'origin/master' into ys_new_features

This commit is contained in:
YuSanka
2019-06-27 14:01:50 +02:00
15 changed files with 55 additions and 18 deletions

View File

@@ -478,6 +478,10 @@ private:
GCodePreviewVolumeIndex m_gcode_preview_volume_index;
#if ENABLE_RENDER_PICKING_PASS
bool m_show_picking_texture;
#endif // ENABLE_RENDER_PICKING_PASS
#if ENABLE_RENDER_STATISTICS
RenderStats m_render_stats;
#endif // ENABLE_RENDER_STATISTICS