Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

VkCV Framework
- Activity
- Members
- Labels
- Terraform modules
- Service Desk
- Contributor analytics
- Model experiments

Snippets Groups Projects

2b4115d7

Commit 2b4115d7 authored 3 years ago by Mara Vogt

Downloads
- Patches
- Plain Diff

[#63]fixed merge mistakes

parent 52f0a1ca

No related branches found

No related tags found

1 merge request!51Resolve "Laden mehrer Meshes mit Materials und Textures"

Pipeline #25660 failed 3 years ago

Stage: build

Stage: deploy

Changes 4
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

include/vkcv/VertexLayout.hpp 2 additions, 1 deletion

include/vkcv/VertexLayout.hpp
modules/asset_loader/src/vkcv/asset/asset_loader.cpp 3 additions, 3 deletions

modules/asset_loader/src/vkcv/asset/asset_loader.cpp
projects/cmd_sync_test/src/main.cpp 7 additions, 4 deletions

projects/cmd_sync_test/src/main.cpp
projects/first_mesh/src/main.cpp 5 additions, 5 deletions

projects/first_mesh/src/main.cpp

with 17 additions and 13 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment