v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3494 from assimp/issue_3198 

closes https://github.com/assimp/assimp/issues/3198: make aiMaterial:…
pull/3492/head^2
Kim Kulling 2020-11-10 13:21:16 +01:00 committed by GitHub
parent 957e468c8a 8c91d1a3cd
commit 5da3e633e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 440 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/Material/MaterialSystem.cpp
View File

@ -402,7 +402,7 @@ aiMaterial::~aiMaterial() {
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
aiString aiMaterial::GetName() { aiString aiMaterial::GetName() const {
aiString name; aiString name;
Get(AI_MATKEY_NAME, name); Get(AI_MATKEY_NAME, name);

915
include/assimp/material.h
View File

File diff suppressed because it is too large Load Diff

2
include/assimp/material.inl
View File

@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2020, assimp team Copyright (c) 2006-2020, assimp team
All rights reserved. All rights reserved.
Redistribution and use of this software in source and binary forms, Redistribution and use of this software in source and binary forms,