Skip to content
Snippets Groups Projects
Commit 240dcb20 authored by jwendt's avatar jwendt
Browse files

Merge branch 'feature/#415_ResourcePointer_cCmponent' of... 

Merge branch 'feature/#415_ResourcePointer_cCmponent' of https://devhub.vr.rwth-aachen.de/VR-Group/Project_Phoenix

# Conflicts:
#	library/phx/rendering/components/mesh_handle.cpp
#	library/phx/rendering/components/mesh_handle.hpp
#	library/phx/rendering/render_passes/geometry_pass.hpp
#	library/phx/rendering/rendering_system.cpp
parents 1abd8b94 3371b52c
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
Showing
with 238 additions and 150 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment