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.

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

Bump contrib/utf8cpp from 60c490b to 2ad9957 #269

Open
wants to merge 43 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
856547b
Fix Q1 MDL group frame loading, e.g. Q1 progs/flame2.mdl
Garux Apr 5, 2021
83c0dce
Merge branch 'master' into Q1MDLgroup
kimkulling Apr 14, 2021
c776924
fix -Waddress-of-packed-member
Garux May 30, 2021
3b56544
Merge branch 'Q1MDLgroup' of https://github.com/Garux/assimp into Q1M…
Garux May 30, 2021
93edbe8
Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL.
Sep 10, 2021
5895c0c
more const in format detection
Sep 11, 2021
1eb0d18
Including <exception>
sadiki0 Sep 15, 2021
8c84afa
Merge branch 'master' into const-tokens
krishty Sep 15, 2021
79f3368
Merge branch 'master' into static
mahiuchun Sep 17, 2021
95d1232
Merge pull request #4083 from markoffline/patch-1
kimkulling Sep 20, 2021
e6543cb
Merge branch 'master' into static
mahiuchun Sep 20, 2021
4fd7330
Merge pull request #4076 from mahiuchun/static
kimkulling Sep 21, 2021
fb5b5e9
Fix possible nullptr dereferencing in material parsing
kimkulling Sep 21, 2021
590307d
Merge pull request #4085 from assimp/kimkulling-issue_3442
kimkulling Sep 21, 2021
95263b2
Update ObjTools.h
kimkulling Sep 21, 2021
d286aad
Merge pull request #4086 from assimp/kimkulling-obj_refactorings
kimkulling Sep 21, 2021
6cb6a6a
Merge branch 'master' into const-tokens
kimkulling Sep 24, 2021
96e2f1c
Merge pull request #4078 from krishty/const-tokens
kimkulling Sep 24, 2021
1f76b2e
Merge branch 'master' into Q1MDLgroup
kimkulling Oct 1, 2021
2f5a311
Merge pull request #3743 from Garux/Q1MDLgroup
kimkulling Oct 1, 2021
ac6b898
Add support for normal maps, the classic way
kimkulling Oct 1, 2021
3e4cca4
Merge pull request #4106 from assimp/kimkulling-issues-3726
kimkulling Oct 1, 2021
ae951fb
Fix aiString length in aiProcess_EmbedTextures
davidepi Oct 2, 2021
babf3b8
Merge pull request #4108 from davidepi/fix-aistring-embedtextures
kimkulling Oct 4, 2021
da53c38
contrib/zip is now a submodule
krishty Oct 6, 2021
89b20df
contrib/utf8cpp is now a submodule
krishty Oct 6, 2021
ff2b527
Visual C++: warnings are no longer treated as errors
krishty Oct 6, 2021
4e8ca06
fixed contrib/utf8cpp at version 2.3.6 from 2018 to test dependabot
krishty Oct 7, 2021
bf40207
added dependabot configuration
krishty Oct 7, 2021
e5085ec
fixed dependabot configuration error
krishty Oct 7, 2021
d7ae8ee
added dependabot configuration
krishty Oct 7, 2021
826be54
contrib/unzip is now a submodule
krishty Oct 7, 2021
025be78
contrib/rapidjson is now a submodule
krishty Oct 7, 2021
15d2258
fixed contrib/zip at version 0.1.15
krishty Oct 7, 2021
b8c4e0e
contrib/poly2tri is now a submodule
krishty Oct 7, 2021
88152b3
contrib/openddlparser is now a submodule
krishty Oct 7, 2021
a50d3e4
contrib/draco is now a submodule
krishty Oct 8, 2021
1e95572
contrib/android-cmake is now a submodule
krishty Oct 8, 2021
7d2a63f
contrib/googletest is now a submodule
krishty Oct 8, 2021
13dfc0d
contrib/pugixml is now a submodule
krishty Oct 8, 2021
b0b635e
Merge branch 'dependencies-as-submodules'
krishty Oct 8, 2021
a754b43
allowing more dependency updates
krishty Oct 8, 2021
de4fd7d
Bump contrib/utf8cpp from `60c490b` to `2ad9957`
dependabot[bot] Jan 16, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use Safe Constants Idioms for ObjFileParser::DEFAULT_MATERIAL.
Reference: "A static Class Member" in https://abseil.io/tips/140
  • Loading branch information
Hill Ma committed Sep 10, 2021
commit 93edbe883f0e89cdd207d18f85ccaa0544ae1c6d
3 changes: 1 addition & 2 deletions code/AssetLib/Obj/ObjFileParser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/BaseImporter.h>
#include <assimp/DefaultIOSystem.h>
#include <assimp/ParsingUtils.h>
#include <assimp/material.h>
#include <assimp/DefaultLogger.hpp>
#include <assimp/Importer.hpp>
#include <cstdlib>
Expand All @@ -56,7 +55,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

namespace Assimp {

const std::string ObjFileParser::DEFAULT_MATERIAL = AI_DEFAULT_MATERIAL_NAME;
constexpr char ObjFileParser::DEFAULT_MATERIAL[];

ObjFileParser::ObjFileParser() :
m_DataIt(),
Expand Down
3 changes: 2 additions & 1 deletion code/AssetLib/Obj/ObjFileParser.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define OBJ_FILEPARSER_H_INC

#include <assimp/IOStreamBuffer.h>
#include <assimp/material.h>
#include <assimp/mesh.h>
#include <assimp/vector2.h>
#include <assimp/vector3.h>
Expand Down Expand Up @@ -141,7 +142,7 @@ class ASSIMP_API ObjFileParser {
// because the class contains pointer to allocated memory

/// Default material name
static const std::string DEFAULT_MATERIAL;
static constexpr char DEFAULT_MATERIAL[] = AI_DEFAULT_MATERIAL_NAME;
//! Iterator to current position in buffer
DataArrayIt m_DataIt;
//! Iterator to end position of buffer
Expand Down