Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

add baking to default build, add default to baking status

Browse source
This commit is contained in:
Stephen Birarda 2017-08-30 15:14:53 -07:00
parent 3abca67f1a
commit ed21ad11d2
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/baking/CMakeLists.txt
View file

@ -11,7 +11,5 @@ if (FBX_FOUND)
target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR}) target_include_directories(${TARGET_NAME} SYSTEM PRIVATE ${FBX_INCLUDE_DIR})
endif () endif ()
set_target_properties(${TARGET_NAME} PROPERTIES EXCLUDE_FROM_ALL TRUE EXCLUDE_FROM_DEFAULT_BUILD TRUE)
link_hifi_libraries(shared model networking ktx image) link_hifi_libraries(shared model networking ktx image)
include_hifi_library_headers(gpu) include_hifi_library_headers(gpu)

5
libraries/networking/src/AssetUtils.cpp
View file

@ -87,8 +87,6 @@ bool isValidHash(const AssetHash& hash) {
QString bakingStatusToString(BakingStatus status) { QString bakingStatusToString(BakingStatus status) {
switch (status) { switch (status) {
case Unrelevant:
return "--";
case NotBaked: case NotBaked:
return "Not Baked"; return "Not Baked";
case Pending: case Pending:
@ -99,5 +97,8 @@ QString bakingStatusToString(BakingStatus status) {
return "Baked"; return "Baked";
case Error: case Error:
return "Error"; return "Error";
default:
case Unrelevant:
return "--";
} }
} }