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

Merge pull request #1418 from umlaeute/debian-fixes-4.0.1 

Debian fixes 4.0.1
pull/1421/head
Kim Kulling 2017-09-05 14:57:06 +02:00 committed by GitHub
parent f8146e4da2 eb0ace4e18
commit ee56ffa1f1
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
.gitattributes vendored
View File

@ -13,3 +13,10 @@ CHANGES text eol=lf
CREDITS text eol=lf CREDITS text eol=lf
LICENSE text eol=lf LICENSE text eol=lf
Readme.md text eol=lf Readme.md text eol=lf
# make sure that repo-specific settings (.gitignore, CI-setup,...)
# are excluded from the source-package generated via 'git archive'
.git* export-ignore
/.travis* export-ignore
/.coveralls* export-ignore
appveyor.yml export-ignore

2
code/PlyLoader.cpp
View File

@ -538,7 +538,7 @@ void PLYImporter::LoadFace(const PLY::Element* pcElement, const PLY::ElementInst
ai_assert(NULL != instElement); ai_assert(NULL != instElement);
if (mGeneratedMesh == NULL) if (mGeneratedMesh == NULL)
throw DeadlyImportError("Invalid .ply file: Vertices shoud be declared before faces"); throw DeadlyImportError("Invalid .ply file: Vertices should be declared before faces");
bool bOne = false; bool bOne = false;

7
port/PyAssimp/setup.py
View File

@ -8,6 +8,9 @@ setup(name='pyassimp',
description='Python bindings for the Open Asset Import Library (ASSIMP)', description='Python bindings for the Open Asset Import Library (ASSIMP)',
url='https://github.com/assimp/assimp', url='https://github.com/assimp/assimp',
packages=['pyassimp'], packages=['pyassimp'],
data_files=[('share/pyassimp', ['README.md']), data_files=[
('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')])], requires=['numpy'] ('share/pyassimp', ['README.md']),
('share/examples/pyassimp', ['scripts/' + f for f in os.listdir('scripts/')])
],
requires=['numpy']
) )