Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix #4262 Build With M3D Import Only #4879

Merged
merged 2 commits into from
Jan 17, 2023
Merged

Fix #4262 Build With M3D Import Only #4879

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5cbc00a
Fix Build With M3D Import Only
Jan 16, 2023
e9f95e5
Merge branch 'master' into fix-build-with-m3d-import-only
kimkulling Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 1 addition & 3 deletions code/AssetLib/M3D/M3DWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

----------------------------------------------------------------------
*/
#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
#if !(ASSIMP_BUILD_NO_EXPORT || ASSIMP_BUILD_NO_M3D_EXPORTER)
#if !defined ASSIMP_BUILD_NO_M3D_IMPORTER || !(defined ASSIMP_BUILD_NO_EXPORT || defined ASSIMP_BUILD_NO_M3D_EXPORTER)

#include "M3DWrapper.h"

Expand Down Expand Up @@ -149,4 +148,3 @@ void M3DWrapper::ClearSave() {
} // namespace Assimp

#endif
#endif
4 changes: 1 addition & 3 deletions code/AssetLib/M3D/M3DWrapper.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#ifndef AI_M3DWRAPPER_H_INC
#define AI_M3DWRAPPER_H_INC

#ifndef ASSIMP_BUILD_NO_M3D_IMPORTER
#if !(ASSIMP_BUILD_NO_EXPORT || ASSIMP_BUILD_NO_M3D_EXPORTER)
#if !defined ASSIMP_BUILD_NO_M3D_IMPORTER || !(defined ASSIMP_BUILD_NO_EXPORT || defined ASSIMP_BUILD_NO_M3D_EXPORTER)

#include <memory>
#include <vector>
Expand Down Expand Up @@ -126,7 +125,6 @@ inline m3d_t *M3DWrapper::M3D() const {

} // namespace Assimp

#endif
#endif // ASSIMP_BUILD_NO_M3D_IMPORTER

#endif // AI_M3DWRAPPER_H_INC