Skip to content

Commit 80ad67f

Browse files
committed
default off PLY and STL writers for now, fix CSTLMeshLoader initialization in IAssetManager
1 parent 0f67f88 commit 80ad67f

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/nbl/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ option(_NBL_COMPILE_WITH_MTL_LOADER_ "Compile with MTL Loader" OFF) #default off
5353
option(_NBL_COMPILE_WITH_OBJ_LOADER_ "Compile with OBJ Loader" OFF) #default off until Material Compiler 2
5454
#option(_NBL_COMPILE_WITH_OBJ_WRITER_ "Compile with OBJ Writer" ON) uncomment when writer exists
5555
option(_NBL_COMPILE_WITH_STL_LOADER_ "Compile with STL Loader" ON)
56-
option(_NBL_COMPILE_WITH_STL_WRITER_ "Compile with STL Writer" ON)
56+
option(_NBL_COMPILE_WITH_STL_WRITER_ "Compile with STL Writer" OFF)
5757
option(_NBL_COMPILE_WITH_PLY_LOADER_ "Compile with PLY Loader" ON)
58-
option(_NBL_COMPILE_WITH_PLY_WRITER_ "Compile with PLY Writer" ON) #default off until reimplemented
58+
option(_NBL_COMPILE_WITH_PLY_WRITER_ "Compile with PLY Writer" OFF) #default off until reimplemented
5959
option(_NBL_COMPILE_WITH_JPG_LOADER_ "Compile with JPG Loader" ON)
6060
option(_NBL_COMPILE_WITH_JPG_WRITER_ "Compile with JPG Writer" ON)
6161
option(_NBL_COMPILE_WITH_PNG_LOADER_ "Compile with PNG Loader" ON)

src/nbl/asset/IAssetManager.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ void IAssetManager::initializeMeshTools()
121121
void IAssetManager::addLoadersAndWriters()
122122
{
123123
#ifdef _NBL_COMPILE_WITH_STL_LOADER_
124-
addAssetLoader(core::make_smart_refctd_ptr<asset::CSTLMeshFileLoader>(this));
124+
addAssetLoader(core::make_smart_refctd_ptr<asset::CSTLMeshFileLoader>());
125125
#endif
126126
#ifdef _NBL_COMPILE_WITH_PLY_LOADER_
127127
addAssetLoader(core::make_smart_refctd_ptr<asset::CPLYMeshFileLoader>());

0 commit comments

Comments
 (0)