Skip to content
Snippets Groups Projects
Commit c253b671 authored by Sebastian Pape's avatar Sebastian Pape
Browse files

Fixed issues with that occurred from merge

parent 0d4b2846
No related branches found
No related tags found
No related merge requests found
...@@ -173,5 +173,6 @@ void phx::ControllerOverlay::setEntityImage( ...@@ -173,5 +173,6 @@ void phx::ControllerOverlay::setEntityImage(
phx::Entity* e, phx::ResourcePointer<phx::Image> i) { phx::Entity* e, phx::ResourcePointer<phx::Image> i) {
e->GetFirstComponent<phx::MaterialHandle>()->GetMaterial()->SetAmbientImage( e->GetFirstComponent<phx::MaterialHandle>()->GetMaterial()->SetAmbientImage(
i); i);
e->GetFirstComponent<phx::MaterialHandle>()->GetMaterial()->UploadTextures();
} }
} // namespace phx } // namespace phx
...@@ -279,6 +279,7 @@ void RayPass::createTarget() { ...@@ -279,6 +279,7 @@ void RayPass::createTarget() {
target_screen_ = handle; target_screen_ = handle;
} }
} }
target_screen_->GetMaterial()->UploadTextures();
target_texture = target_screen_->GetMaterial()->GetAmbientTexture(); target_texture = target_screen_->GetMaterial()->GetAmbientTexture();
// used to expand the data in RAM and map back to GPU // used to expand the data in RAM and map back to GPU
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment