Showing the changes to interface/src/Application_render.cpp (1 of 1213 files). Show all
Unified · Split
| @@ -55,7 +55,7 @@ void Application::paintGL() { · 54 unmodified lines | |||
| 55 | // If a display plugin loses it's underlying support, it | 55 | // If a display plugin loses it's underlying support, it |
| 56 | // needs to be able to signal us to not use it | 56 | // needs to be able to signal us to not use it |
| 57 | if (!displayPlugin->beginFrameRender(_renderFrameCount)) { | 57 | if (!displayPlugin->beginFrameRender(_renderFrameCount)) { |
| 58 | updateDisplayMode(); | 58 | QMetaObject::invokeMethod(this, "updateDisplayMode"); |
| 59 | return; | 59 | return; |
| 60 | } | 60 | } |
| 61 | } | 61 | } |
| @@ -178,7 +178,7 @@ public: · 116 unmodified lines | |||
| 178 | render::ItemID WorldBoxRenderData::_item{ render::Item::INVALID_ITEM_ID }; | 178 | render::ItemID WorldBoxRenderData::_item{ render::Item::INVALID_ITEM_ID }; |
| 179 | 179 | ||
| 180 | namespace render { | 180 | namespace render { |
| 181 | template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape(); } | 181 | template <> const ItemKey payloadGetKey(const WorldBoxRenderData::Pointer& stuff) { return ItemKey::Builder::opaqueShape().withTagBits(ItemKey::TAG_BITS_0 | ItemKey::TAG_BITS_1); } |
| 182 | template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); } | 182 | template <> const Item::Bound payloadGetBound(const WorldBoxRenderData::Pointer& stuff) { return Item::Bound(); } |
| 183 | template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) { | 183 | template <> void payloadRender(const WorldBoxRenderData::Pointer& stuff, RenderArgs* args) { |
| 184 | if (Menu::getInstance()->isOptionChecked(MenuOption::WorldAxes)) { | 184 | if (Menu::getInstance()->isOptionChecked(MenuOption::WorldAxes)) { |