Merge pull request #3494 from assimp/issue_3198

closes https://github.com/assimp/assimp/issues/3198: make aiMaterial:…
2020-11-10 13:21:16 +01:00 · 2020-11-10 13:21:16 +01:00 · 5da3e633e3
parent 957e468c8a 8c91d1a3cd
commit 5da3e633e3
3 changed files with 440 additions and 479 deletions
--- a/code/Material/MaterialSystem.cpp
+++ b/code/Material/MaterialSystem.cpp
@ -402,7 +402,7 @@ aiMaterial::~aiMaterial() {
 }

 // ------------------------------------------------------------------------------------------------
-aiString aiMaterial::GetName() {
+aiString aiMaterial::GetName() const {
    aiString name;
    Get(AI_MATKEY_NAME, name);

--- a/include/assimp/material.h
+++ b/include/assimp/material.h
--- a/include/assimp/material.inl
+++ b/include/assimp/material.inl
@ -5,8 +5,6 @@ Open Asset Import Library (assimp)

 Copyright (c) 2006-2020, assimp team

-
-
 All rights reserved.

 Redistribution and use of this software in source and binary forms,