瀏覽代碼

Merge pull request #3494 from assimp/issue_3198

closes https://github.com/assimp/assimp/issues/3198: make aiMaterial:…
Kim Kulling 4 年之前
父節點
當前提交
5da3e633e3
共有 3 個文件被更改,包括 379 次插入410 次删除
  1. 1 1
      code/Material/MaterialSystem.cpp
  2. 378 407
      include/assimp/material.h
  3. 0 2
      include/assimp/material.inl

+ 1 - 1
code/Material/MaterialSystem.cpp

@@ -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);
 
 

File diff suppressed because it is too large
+ 378 - 407
include/assimp/material.h


+ 0 - 2
include/assimp/material.inl

@@ -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,

Some files were not shown because too many files changed in this diff