diff --git a/common/lc_application.cpp b/common/lc_application.cpp index 3648dfd9..48e4ec1d 100644 --- a/common/lc_application.cpp +++ b/common/lc_application.cpp @@ -1213,7 +1213,6 @@ void lcApplication::ShowPreferencesDialog() lcGetPiecesLibrary()->LoadColors(); } - gMainWindow->SetShadingMode(Options.Preferences.mShadingMode); lcView::UpdateAllViews(); } diff --git a/common/lc_library.cpp b/common/lc_library.cpp index 48355d2f..d51b24c7 100644 --- a/common/lc_library.cpp +++ b/common/lc_library.cpp @@ -1580,7 +1580,7 @@ void lcPiecesLibrary::SetStudStyle(lcStudStyle StudStyle, bool Reload) { lcLibraryPrimitive* Primitive = PrimitiveIt.second; - if (Primitive->mStudStyle) + if (Primitive->mStudStyle || Primitive->mMeshData.mHasStyleStud) Primitive->Unload(); } } diff --git a/common/lc_meshloader.cpp b/common/lc_meshloader.cpp index 4ef696c1..493f9875 100644 --- a/common/lc_meshloader.cpp +++ b/common/lc_meshloader.cpp @@ -1625,7 +1625,7 @@ bool lcMeshLoader::ReadMeshData(lcFile& File, const lcMatrix44& CurrentTransform else Library->GetPrimitiveFile(Primitive, FileCallback); - mMeshData.mHasStyleStud |= Primitive->mStudStyle; + mMeshData.mHasStyleStud |= Primitive->mStudStyle | Primitive->mMeshData.mHasStyleStud; } else Library->GetPieceFile(FileName, FileCallback);