From c253b671c849b97e01f92cbfd5b7c62bed6b777f Mon Sep 17 00:00:00 2001
From: Sebastian Pape <Sebastian.Pape@rwth-aachen.de>
Date: Tue, 17 Jul 2018 17:23:45 +0200
Subject: [PATCH] Fixed issues with that occurred from merge
---
demos/optical_bench/src/controller_overlay.cpp | 1 +
demos/optical_bench/src/ray_pass.cpp | 1 +
2 files changed, 2 insertions(+)
diff --git a/demos/optical_bench/src/controller_overlay.cpp b/demos/optical_bench/src/controller_overlay.cpp
index f6bb6a77..3bea06ff 100644
--- a/demos/optical_bench/src/controller_overlay.cpp
+++ b/demos/optical_bench/src/controller_overlay.cpp
@@ -173,5 +173,6 @@ void phx::ControllerOverlay::setEntityImage(
phx::Entity* e, phx::ResourcePointer<phx::Image> i) {
e->GetFirstComponent<phx::MaterialHandle>()->GetMaterial()->SetAmbientImage(
i);
+ e->GetFirstComponent<phx::MaterialHandle>()->GetMaterial()->UploadTextures();
}
} // namespace phx
diff --git a/demos/optical_bench/src/ray_pass.cpp b/demos/optical_bench/src/ray_pass.cpp
index cc1e7a6f..4b62e04a 100644
--- a/demos/optical_bench/src/ray_pass.cpp
+++ b/demos/optical_bench/src/ray_pass.cpp
@@ -279,6 +279,7 @@ void RayPass::createTarget() {
target_screen_ = handle;
}
}
+ target_screen_->GetMaterial()->UploadTextures();
target_texture = target_screen_->GetMaterial()->GetAmbientTexture();
// used to expand the data in RAM and map back to GPU
--
GitLab