Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
assimp: Autospec creation for update from version 4.0.1 to version 4.1.0
(1):
Fix install for builds with MSVC compiler and NMake.
Alexander Gessler (2):
Merge pull request #1365 from ihmcrobotics/feature/custom-library-loader
Update version check in FBX reader to check for version >= 7500 instead of exactly 7500.
Alexandre Avenel (9):
OBJ : add unit test to validate relative indices
Return exception when obj file contains invalid face indice
Add two unit tests for OBJ importer
Copy assimp dll to unit folder on windows
Fix typo on gltf2 camera parameters
Fix warning C4138: '*/' found outside of comment on MSVC14
Fix MSVC14 warning cast double to real
Fix warning cast double to float
Fix warning on MSVC14
Amit Cirt (1):
fix name lost in mesh and nodes when load with aiProcess_PreTransformVertices flag
Arshia001 (1):
Fix OBJ discarding all material names if the material library is missing
Daeyun Shin (1):
Update helper.py
Daniel Hritzkiv (76):
Ensure gltf asset version is printed as \d.0
version in glb header is stored as uint32_t
Formatting
Duplicate gltfImporter as gltf2Importer; Include glTF2 importer in CMake List
Update glTF2 Asset to use indexes
Disambiguate Get methods
Cache retrieved items via an original index map
Start reading pbr materials
temporarily disable gltf exporting of animations and skins
Start managing and importing gltf2 pbr materials
check in gltf2 models to test directory Remove un-needed test models
Working read, import, export, and write of gltf2 (pbr) material
Use `!ObjectEmpty()` vs. `MemberCount() > 0`
Remove redundant function
Start removing materials common, and adding pbrSpecularGlossiness
Remove Light, Technique references
Changes to GLTF2 materials
Remove OPEN3DGC and compression references
mention pbrSpecularGlossiness support
Make sure `on` flag for specularGlossiness is being persisted
Write specularGlossiness textures on the specularGlossiness object
reenable animation and skins exports
store node mesh vs. meshes
Only export byteStride if not 0
Formatting
Export extensions
Fix unused CopyValue
Set default values on Sampler
Sampler improvements; Add new LazyDict method
Export material names properly
Use different form of index accessor
Remove need for Has by returning an empty Ref in Get
Define default material values as static constants
Implement pbrSpecularGlossiness property as Nullable
Fix indentation
Define gltf material property names as constants
Fix METALLIC_FACTOR typo
Set the metallicFactor to 0 if source file doesn’t have metallicFactor
Set alphaMode, baseColorFactor opacity when model’s opacity isn’t 1
Remove commented out code
Remove premultipliedAlpha from gltf2
Load gltf .bin files from correct directory
more specific token search for Collada Loader
Add gltf2 basic unit test
Remove compresssed file format flag
Remove KHR_binary_glTF code
Fix mesh primitive’s attributes’ names
Use `forceNumber` argument of `WriteAttrs` to write correct attribute names, instead
Formatting
Exclude glTF2 Exporter test when ASSIMP_BUILD_NO_EXPORT
Remove simple gltf2 export unit test
Revert "Remove simple gltf2 export unit test"
Fix Segfault caused by losing pointer to std::string
Update glTF in list of importers and exporters
Revert "store node mesh vs. meshes"
Merge multiple meshes in a node into one mesh with many primtives; write out only one mesh per node
Formatting
tweaks to primitive merging logic; comments + formatting
SImplify mesh merging code
Fix alphaMode storage and reading
Formatting
Don’t ignore rgba(1,1,1,1) color properties
Fix output of glTF 1 version string
Diffuse color and diffuse texture import and export improvements
SpecularFactor import and export improvements
Approximate specularity / glossiness in metallicRoughness materials
Prefer “BLEND” over “MASK” as an alphaMode default
powf -> pow
Fix shininess to roughness conversion; Add comments
Set mNumUVComponents to 0 when deleting texture coordinate sets
Formatting
Return early when element is TextureFile
Fix export of deleted meshes; Add LazyDict::Remove method
Restore import of multi mesh binary STLs
Add test for GLB import
Fix node names sharing same name
Doug Stephen (9):
Added missing include to stdlib.h and remove load library call
Update .gitignore
Create AiMetadataEntry.java for jassimp port.
Added field and getter for metadata entries to AiNode.java.
Fix small bug in getStaticField
Populate metadata on Java objects.
Merge remote-tracking branch 'upstream/master' into feature/collada-up_axis-api-improvements
Fix header and remove old debug code
Added helper getters for casting metadata payloads
Eduardo Costa (1):
Re-enabling PACK_STRUCT for MDL files.
Giuseppe Barbieri (7):
Added a link to pure jvm assimp port
Update Importer.cpp
Update ValidateDataStructure.h
Update ValidateDataStructure.h
Update ValidateDataStructure.cpp
Update Readme.md
Update MD3Loader.cpp
Haik Lorenz (1):
Prevent failing stringstream to crash the export process
IOhannes m zmölnig (3):
fixed spelling error
split setup.py into multiple lines
exclude repository-settings from source-package generated via 'git archive'
Jared Mulconry (70):
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Fixed warnings when compiling for x64 on MSVC through VS 2017 v15.3.3.
Merge branch 'master' of github.com:assimp/assimp into issue_1065
Addressed last remaining warning under MSVC caused by use of 'deprecated' fopen.
Addressed warnings generated on MSVC across x86 and x64.
Fixed an error when compiling samples under MSVC that was caused by assuming including windows.h would pull in shellapi.h
Fixed a warning caused by aiVector3D appearing in a packed struct, causing it to fail to pack as requested.
Fixed unused variable warning by replacing them with descriptive comments
Suppressed warning on gcc caused by the 'visibility' attribute being ignored on types.
Changed the FileSizeTest to not rely on tmpnam to eliminate warning on gcc.
Replaced flakey macros with specific functions to serve the purpose
Changed the method by which temporary files are created for unit the FileSizeTest. Will apply to other tests next.
Merge branch 'master' of github.com:assimp/assimp into issue_1330
Added a header to hold the file generation code for unit testing purposes.
Improved the naming of temporary file generator function. Replaced use of tmpnam in utIOStreamBuffer with this facility to addresssafety warning.
Replaced unsigned long for the crc table to z_crc_t, to match what is returned by get-crc_table
Changed a couple more function interfaces to correct the input type.
Merge branch 'master' of github.com:assimp/assimp into issue_1330
Added -fPIC flag to C compilers for GCC and clang. Removed -pedantic flag from some compilers.
Eliminated all warnings under clang with default settings. One remains in the included zlib contrib project.
Addressed asan failures caused by misuse of APIs within unit tests.
Addressed a number of memory leaks identified in unit tests by asan
Addressed some mismatched news/deletes caused by the new glTF2 sources.
Upgraded zlib to 1.2.11.1 from the develop branch.
Merge branch 'master' of github.com:assimp/assimp into issue_1470
Removed unnecessary files from zlib contribution
Address warnings on Clang 3.9 caused by having a static data member in a class template.
Fixed warnings on MSVC caused by implicit conversions from double to float.
Fixed warnings on MSVC caused by implicit conversions from double to float.
Cleaned up appveyor setup, added VS 2017 to the build matrix and attempted to add running of tests.
Apparently @ escaping batch commands doesn't work in this context.
Merge branch 'master' into appveyor
Replaced the worker image name, which doesn't work as generator name, with a manually created generator name.
x86 isn't a valid VS platform. Win32 it is, then.
Paths aren't what I expected for the test directory. Trying something else, with a testing call to dir to help track it down.
Attempting to get the tests detected and run.
Attempting to address issues with cloning the repo. shallow_copy seems to fail at times. I'll let it continue to clone the whole history.
Attempting to get tests to run.
Fixed up the path to the build artifacts to be cached.
Updated test output to log to xml and to upload those results appropriately, so they show up in AppVeyor correctly as tests at the end.
Added the mtime_cache script to hopefully improve use of incremental building with appveyor. Reduced the verbosity of the appveyor config. Added use of mtime_cache. Fixed the output of an xml version of the test output for hooking into appveyor.
The environment section uses different syntax for a list of vars.
Fixed some bad usage of environment variables.
The environment section doesn't do what I thought it would. Duplication is bad, but seems neccessary.
Refined the appveyor config so that test output is reported even if tests fail.
Attempting to get test results reporting even if an error occurrs.
Fixing multiline batch command weirdness.
No fun/multiline allowed.
Quote escaping across nested batch and powershell hurts my brain.
Attempting to address failures with chained batch and powershell commands.
Merging the test_script with test reporting was a terrible idea in retrospect. on_finish should serve the purpose.
Test failures are now getting properly reported. Turning off 'fast finish' to allow all tests to execute.
Fixed IOStream reporting a file size of 0 for files that have been written, but not yet been flushed to disk.
Merge branch 'master' of github.com:jaredmulconry/assimp into appveyor
Merge branch 'master' of github.com:assimp/assimp into appveyor
Because I have to change a file somewhere to properly test the cache on AppVeyor, I've made some whitespace a bit better.
Merge branch 'master' into appveyor
Attempting to fix the directories being cached.
Merge branch 'master' into appveyor
I think I've worked out where the obj's are located. We shall see if the cache picks them up.
Cleaned up the whitespace again. Let's see how the cache does.
Another minor source change, this time even more minor than the last. Let's see what the cache can do with this.
Merge branch 'master' of github.com:assimp/assimp into appveyor
Fixed a divide by zero error in IFCBoolean that was latent, but nevertheless a bug
Jeremy Abel (3):
changed a few leftover asserts to ai_assert
should be map, not set
Added wiki link to C4D file format
Jeremy Cowles (1):
Fix glTF 2.0 multi-primitive support
Jesper Smith (8):
Provided access to the library loading code to allow custom library loaders
Added javadoc for the JassimpLibraryLoader
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
Added return statement to Write
Added supported for custom IO Systems in Java. Implemented ClassLoader IO System
Added return statement to Write
Fixed copyright notice for IHMC jassimp improvements to BSD. Updated README
Merge remote-tracking branch 'upstream/master' into feature/jassimp-classloader-license
John Senneker (5):
Restrict search for OFF header to first 3 bytes
Add support for importing both glTF and glTF2 files
Fix parsing of glTF version Handle version as int in gltf Fix format specifiers in glTF version parser
Properly move string passed to JSON writer
Manually read alphaMode material property
Josh Faust (1):
Fix glTF2::Asset::FindUniqueID() when the input string is >= 256 chars
Kim Kulling (295):
Merge pull request #1366 from titorgalaxy/master
Merge pull request #1364 from pdaehne/master
Merge pull request #1363 from jamesgk/gltf2
Readme: update list of supported file formats.
Merge branch 'master' of https://github.com/assimp/assimp
Commandline tool: fix url to project space.
cmake cleanup.
closes assimp/assimp#1270: use HasTexture for texture coordinates.
PlyLoader: fix vertex attribute lookup.
ply-importer: fix creation of vertex attributes.
ply-loader: add brackets.
Merge pull request #1370 from 0xcccc/master
unzip: latest greatest.
Merge branch 'master' of https://github.com/assimp/assimp
§
Merge pull request #1378 from dhritzkiv/feature/gltf-version
Merge pull request #1382 from jeremyabel/master
Merge pull request #1383 from jeremyabel/patch-1
assert: remove assert with more than one statement and use only ai_assert.
Merge pull request #1385 from gongminmin/FixForVS2017.3
Merge pull request #1397 from Arshia001/master
Readme: add TriLib to the official list of supported ports.
Merge pull request #1398 from Eljay/fix-irrxml
Merge pull request #1399 from m4c0/master
Update Readme.md
Merge pull request #1400 from kebby/master
Merge pull request #1401 from melMass/python3
Merge pull request #1403 from kebby/fbx_anim_fix
Merge branch 'master' of https://github.com/rickomax/assimp into rickomax-master
Merge pull request #1405 from assimp/rickomax-master
Merge pull request #1408 from assimp/acgessler-patch-4
Merge pull request #1410 from THISISAGOODNAME/master
closes assimp/assimp#1406: fix merge issue + improve 3MF-tests
Fix review findings: remove unused includes
Tests: add 3D-importer test.
FIx build
fix the buil
fix the buil
Merge pull request #1418 from umlaeute/debian-fixes-4.0.1
closes assimp/assimp#1404: set name with merged meshes for output mesh.
Traivis: make build amtrix smaller.
Merge pull request #1421 from assimp/issue_1404
Merge pull request #1422 from elect86/patch-9
Merge pull request #1424 from samitc/feature/fix-mesh-name-lost-with-PreTransformVertices-flag
Merge pull request #1425 from jaredmulconry/issue_1065
closes assimp/assimp#1426: add Defines.h to include folder for install.
FBX: fix some minor findings.
Merge branch 'master' of https://github.com/assimp/assimp
MDP: fix encoding issues.
Merge pull request #1427 from turol/asan
Merge pull request #1423 from Matter-and-Form/feature/gltf2
Revert "Asan"
Merge pull request #1431 from assimp/revert-1427-asan
Merge pull request #1433 from vkovalev123/patch-1
Merge pull request #1436 from turol/warnings
Merge pull request #1437 from rmitton/sib-version
Merge pull request #1435 from jaredmulconry/issue_1065
Merge pull request #1440 from turol/travis
Merge pull request #1441 from turol/travis
Merge pull request #1442 from jcowles/master
FBX: add missing inversion of postrotation matrix for fbx.
Merge branch 'master' of https://github.com/assimp/assimp
Merge pull request #1446 from Matter-and-Form/feature/gltf2-primitives
Merge pull request #1447 from Matter-and-Form/gltf1-color-import-fix
Merge pull request #1445 from Matter-and-Form/gltf2-alphaMode-fix
Merge pull request #1444 from turol/warnings
Merge pull request #1457 from jaredmulconry/issue_1330
Merge pull request #1461 from jfaust/master
Merge pull request #1462 from jaredmulconry/issue_1330
closes assimp/assimp#1459: fix out-of-boundary access error
Merge branch 'master' of https://github.com/assimp/assimp
Obj: rename attribute from exporter.
closes assimp/assimp#1450: use correct name of exporter to gltf2
Obj: prepare test to reproduce crash on linux.
add some asserts.
Merge pull request #1465 from turol/warnings
Merge pull request #1466 from jaredmulconry/issue_1330
closes assimp/assimp#1467.
OpenGEX: improve logging to be able to detect error-prone situations.
Merge pull request #1468 from assimp/issue_1467
Merge pull request #1469 from turol/warnings
Merge pull request #1432 from turol/asan
Merge pull request #1471 from turol/clang
Merge pull request #1475 from jaredmulconry/master
Merge pull request #1474 from jaredmulconry/issue_1470
Revert "WIP: Enable Travis clang build"
Reproduce issue and remove assertion when a nullptr makes more sence
Merge branch 'master' into issue_1453
Merge pull request #1483 from turol/warnings
Merge branch 'master' into msvc2013_tempfile_fix
Merge pull request #1484 from jaredmulconry/msvc2013_tempfile_fix
Merge branch 'master' into master
Merge pull request #1482 from TransformAndLighting/master
Merge branch 'master' into issue_1453
Update utObjImportExport.cpp
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
Merge pull request #1464 from assimp/issue_1453
Merge pull request #1479 from jaredmulconry/appveyor
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
Blender: fix short overflow.
Merge pull request #1491 from assimp/fix_blender_overflow
Merge branch 'master' into feature/jassimp-classloader
UnitTest: use correct initialized normals in unittest.
Merge pull request #1489 from ihmcrobotics/feature/jassimp-classloader
Merge branch 'master' into invalid_normals_in_unittest
Merge pull request #1494 from assimp/invalid_normals_in_unittest
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
Update ColladaExporter.cpp
Merge pull request #1499 from ihmcrobotics/feature/collada-up_axis-api-improvements
Merge branch 'master' into unitTestObj
Merge pull request #1496 from aavenel/unitTestObj
Merge branch 'master' into feature/jassimp-classloader-license
Merge pull request #1497 from ihmcrobotics/feature/jassimp-classloader-license
Update Readme.md
Merge pull request #1500 from assimp/kimkulling-doc_path
Update .travis.sh
Update .travis.sh
Merge pull request #1501 from assimp/kimkulling-traviscleanup
Merge pull request #1502 from Matter-and-Form/bugfix/gltf1-version
Merge pull request #1486 from autodesk-forks/adsk-contrib-fix-std-stream-overflow
Merge pull request #1512 from aavenel/safe_atoi_OBJ
Merge branch 'master' into gltf2-materials
Merge pull request #1503 from Matter-and-Form/gltf2-materials
Merge pull request #1516 from Matter-and-Form/gltf2-export-roughness-from-shininess-fix
closes assimp/assimp#1514: add postprocess step for scaling
closes assimp/assimp#1514: add misisng flag to enable global scaling.
Use correct lookup if scaling is enabled.
Add unittest
Add missing file.
only scale the root node because this will rescale all children nodes as well.
Merge pull request #1520 from assimp/issue_1514
closes assimp/assimp#1490 : fix invalid access to mesh array when the array is empty.
Merge pull request #1523 from assimp/issue_1490
Merge pull request #1525 from daeyun/daeyun-lib-dirs
Merge branch 'master' into invalid-texture-coordinates-cleaning-fix
Merge pull request #1524 from Matter-and-Form/invalid-texture-coordinates-cleaning-fix
Merge branch 'master' into fix_trivial_warnings
Update .travis.sh
Merge pull request #1534 from Matter-and-Form/texturefile-int-name-fix
Merge branch 'master' into fix_trivial_warnings
Update .travis.yml
Merge pull request #1535 from assimp/kimkulling-patch-1
Merge branch 'master' into Anatoscope-fix_trivial_warnings
Merge pull request #1536 from assimp/Anatoscope-fix_trivial_warnings
Merge branch 'master' into ObjExporter_nomtl
Merge pull request #1537 from assimp/Anatoscope-ObjExporter_nomtl
Merge branch 'master' into master
Merge branch 'unittest_obj_importer' of https://github.com/aavenel/assimp
Fix memory leak in case of an error.
fix mem-lead: face will be not released in case of an error.
Merge pull request #1538 from assimp/aavenel-unittest_obj_importer
closes assimp/assimp#1351: use correct name for obj-meshname export for groups.
Merge pull request #1541 from assimp/issue_1351
add unittest for x3d-importer.
X3D-Importer: add missing file.
Merge branch 'master' into UnitTest_X3D
closes assimp/assimp#1533: put irrXML onto exclucde list for doxygen run.
Merge pull request #1542 from assimp/UnitTest_X3D
Merge branch 'master' into issue_1533
Merge pull request #1543 from assimp/issue_1533
closes assimp/assimp#1526: use correct include folder for assimp.
closes assimp/assimp#213: log an error instead of letting the fbx-importer crash.
Merge pull request #1544 from assimp/issue_1526
Merge branch 'master' into issue_213
Merge pull request #1545 from assimp/issue_213
closes assimp/assimp#104: deal with more solids in one STL file.
SLD: add test model and a unit test.
Update STLLoader.h
Update STLLoader.cpp
Update STLLoader.cpp
Merge branch 'master' into issue_104
Merge pull request #1549 from assimp/issue_104
Merge branch 'master' into md2_fix
Merge pull request #1551 from larsjsol/md2_fix
closes assimp/assimp#1251: use correct lookup for utf32.
Merge branch 'master' into issue_1251
Merge pull request #1552 from assimp/issue_1251
Update ColladaExporter.cpp
Merge branch 'master' into master
Merge pull request #1511 from eevictor/master
closes assimp/assimp#1315: check in exporting against out-of-bounds-access .
closes assimp/assimp#1292: export class subdivision
Merge branch 'master' into issue_1315
Merge pull request #1555 from assimp/issue_1315
Merge branch 'master' into issue_1292
Merge pull request #1556 from assimp/issue_1292
closes assimp/assimp#216: check the area of a triangle to check if its degenerated or not.
check for area test if the face is a triangle.
Merge pull request #1559 from luzpaz/misc-typos
Merge branch 'master' into gltf2-mesh-export-fix
Merge pull request #1557 from Matter-and-Form/gltf2-mesh-export-fix
unittests: add VS-based source groups for the unittests.
Merge pull request #1560 from assimp/source_groups_for_ut
fix buggy escape sequence.
Merge pull request #1563 from assimp/fix_buggy_excape_sequence
Merge branch 'master' into issue_216
FindDegeneratives: adapt unittests and add configs
Merge pull request #1558 from assimp/issue_216
CMake: use define for D_FILE_OFFSET_BITS only for not-android systems.
Merge pull request #1567 from assimp/fix_android_build
closes assimp/assimp#1513: fix assimp for cross compile for android
Merge pull request #1498 from turol/analyze
Merge pull request #1572 from elect86/patch-11
Merge branch 'master' into issue_1513
Merge pull request #1569 from assimp/issue_1513
Merge pull request #1577 from elect86/patch-14
Fix android build.
Merge branch 'master' into fix_android
Merge pull request #1579 from assimp/fix_android
Merge branch 'master' into patch-13
Merge pull request #1576 from elect86/patch-13
check for nullptr dereferencing before copying scene data
Merge branch 'master' into patch-12
check for 0 properties before copy them
Merge pull request #1584 from pdaehne/master
Merge branch 'master' into master
Merge branch 'master' into patch-12
Merge pull request #1585 from pdaehne/master
Merge branch 'master' into patch-12
3MF: Export initial commit.
Merge branch 'master' into export_3mf
add missing return statement.
3Mf-Export: add prototypes for relations and rest of 3MF-document.
Merge pull request #1586 from turol/validate
Merge branch 'master' into patch-12
use one header for all xml-tags.
Merge pull request #1575 from elect86/patch-12
Merge branch 'master' into scene_combiner_crash
Merge pull request #1580 from assimp/scene_combiner_crash
Merge branch 'master' into master
Merge pull request #1582 from mrautio/master
Merge branch 'master' into patch-15
Merge pull request #1588 from elect86/patch-15
Prepare archive structure.
Add missing file export into archive.
add missing include
Merge pull request #1591 from aavenel/fix-warnings-win
Merge branch 'master' into fix-cmake-unit-win
Merge pull request #1590 from aavenel/fix-cmake-unit-win
Merge branch 'master' into fix-typo-gltf
Merge pull request #1589 from aavenel/fix-typo-gltf
3MF: add export to a given archive.
fix unittest.
Merge branch 'master' into export_3mf
remove unused attribute.
Merge pull request #1596 from Matter-and-Form/feature/gltf2-tangents
Merge branch 'master' into fix/gltf2-preserve-node-names
Merge pull request #1595 from Matter-and-Form/fix/gltf2-preserve-node-names
Merge branch 'master' into fix/gltf2-transforms
Update D3MFExporter.cpp
Update D3MFExporter.h
Merge pull request #1594 from Matter-and-Form/fix/gltf2-transforms
Merge branch 'master' into export_3mf
Update D3MFExporter.cpp
Update .travis.sh
Merge pull request #1599 from assimp/kimkulling-verbose-analyze
Merge branch 'master' into export_3mf
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
fix invalid include
fix unaligned memory access.
fix unaligned memory access.
enable compiler switch test for no exporter requested.
Merge pull request #1603 from Matter-and-Form/fix/gltf-node-name-conflict
Merge branch 'master' into fix/multibody-binary-stls
Merge branch 'master' into export_3mf
fix the exporter unittest when the export is disabled.
Merge branch 'export_3mf' of https://github.com/assimp/assimp into export_3mf
Fx nullptr dereference.
Update STLLoader.cpp
Merge pull request #1598 from assimp/export_3mf
Merge branch 'master' into fix/multibody-binary-stls
Update miniz.h
Merge pull request #1602 from Matter-and-Form/fix/multibody-binary-stls
Merge branch 'master' into patch-16
Merge pull request #1606 from elect86/patch-16
fix invalid op
Merge branch 'master' into kimkulling-miniz-memoryaccessfix
Merge pull request #1604 from assimp/kimkulling-miniz-memoryaccessfix
Update miniz.h
Update miniz.h
Merge pull request #1611 from assimp/kimkulling-patch-2
3MF: fix working test for 3MF-export.
fix correct folder naming scheme.
Merge pull request #1618 from assimp/3mf_export_fixes
FBX: closes assimp/assimp#1619: return correct index for embedded textures.
Merge pull request #1620 from assimp/issue_1619
fix the model xml
Merge pull request #1622 from assimp/fix_model_xml_3mf
Update CREDITS
Merge pull request #1627 from assimp/kimkulling-patch-2
Update to 4.1.0
Update Doxyfile.in
Update CMakeLists.txt
Update utVersion.cpp
Merge pull request #1631 from assimp/kimkulling-410_prep
Knox Shao (1):
Fix android build issues
Lars Jørgen Solberg (1):
fix frame pointer arithmetic
Lee Jeffery (1):
Fix linking issue with irrXML
Marco Di Benedetto (1):
added additional displacement texture token.
Mel Massadian (1):
created a python3 version of the 3dviewer and fixed the / = float in py3
Mika Rautio (2):
Add support for building Mac OS X Framework bundles
Merge branch 'master' into master
Minmin Gong (1):
Fix compiling problems under VS2017.3. 1. WordIterator's operator== and operator!= must take const WordIterator& as parameter type. 2. OpenMP doesn't work with new two phase lookups. Need to disable twoPhase.
Patrick Dähne (3):
X3D importer: Workaround for buggy Android NDK (issue #1361)
[glTF2] Implemented reading binary glTF2 (glb) files
[glTF2] Moved byteStride from accessor to bufferView
Richard Mitton (3):
Merge pull request #1 from assimp/master
Fixed truncated material names
Added Silo 2.5 support
THISISAGOODNAME (1):
Fix assimp_qt_viewer build failed on OSX
Tammo Hinrichs (5):
Collada importer: Add support for line strip primitives
FBX importer: Use actual min/max of animation keyframes when start/stop time is missing
FBX importer: don't rely ont INT64_MIN / ..MAX macros
FBX importer: Back to INT64_MIN but include <stdint.h> also.
FBX importer: try a constant again (ll suffix this time)
Thomas (1):
[ObjExporter] add a "no mtl" version of the obj exporter
Thomas Lemaire (2):
[ObjExporter] add a test for the "no mtl" version of the obj exporter
fix trivial warnings
Turo Lamminen (136):
Add AddressSanitizer option to CMake
Enable AddressSanitizer for Linux clang build
Fix delete / delete[] mismatch in glTFAsset
Add CMake flag to treat warnings as errors
glTFExporter: Silence uninitialized variable warning
DefaultLogger: Whitespace cleanup to fix GCC misleading indentation warning
AssbinExporter: Add Write specialization for aiColor3D
AssbinExporter: Fix strict aliasing violation
Importer: Whitespace cleanup to fix GCC misleading indentation warning
FBXParser: Silence uninitialized variable warnings
travis: Move os declarations earlier
travis: Correctly minimize build matrix
travis: Only build with xcode 8.3
travis: Enable ccache
Travis: Disable OS X build since it doesn't do anything currently
Collada: Silence uninitialized variable warning
FIReader: Silence uninitialized variable warning
PlyLoader: Fix operator precedence issue in header check
glTF: Silence uninitialized variable warning
BlenderDNA: Silence warning about inline function which is declared but not defined
Open3DGC: Fix some uninitialized variable warnings
Fix CMAKE option name
travis: Treat warnings as errors
Add AddressSanitizer option to CMake
Enable AddressSanitizer for Linux clang build
Fix delete / delete[] mismatch in glTFAsset
Fix out-of-bounds read in MaterialSystem unit test
Fix delete / delete[] mismatches in MakeVerboseFormat
Fix delete / delete[] mismatches in glTF2 importer
Fix warnings-as-errors flag on MSVC
appveyor: Treat warnings as errors
Disable warning 4351 on MSVC 2013
Travis: Build with clang too
Travis: Treat warnings as errors, without typos this time
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
Fix warning about non-constant array size
IFCImporter: Add explicit instantiation of log_prefix so IFCMaterial.cpp can see it
FBXImporter: Add explicit instantiation of log_prefix so other FBX source files can see it
Upgrade RapidJSON to get rid of a clang warning
utMetadata: Fix memory leak
utRemoveVCProcess: Fix memory leak
UnrealLoader: Fix IOStream leak
AMFImporter: Fix memory leak
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
OpenGEXImporter: Fix IOStream leak
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
OpenGEXImporter: Copy materials to scene
Travis: Build with clang too
Travis: Treat warnings as errors, without typos this time
CMake: Remove OpenMP stuff, it's unused and breaks Travis clang build
Fix warning about non-constant array size
Upgrade RapidJSON to get rid of a clang warning
utMetadata: Fix memory leak
utRemoveVCProcess: Fix memory leak
UnrealLoader: Fix IOStream leak
AMFImporter: Fix memory leak
OpenGEXImporter: Store ChildInfo in unique_ptr so they get automatically cleaned up
OpenGEXImporter: Fix IOStream leak
OpenGEXImporter: Store RefInfo in unique_ptr so they get automatically cleaned up
OpenGEXImporter: Copy materials to scene
Travis: Remove unused LINUX env variable
Travis: Refactor how we build CMake options
CMake: Be more verbose about enabled options
Travis: ASAN is now implicitly off, disable explicit off
Travis: ENABLE_COVERALLS is now implicitly off, disable explicit off
Travis: Disable GCC AddressSanitizer build, Clang AddressSanitizer is strictly better
Travis: TRAVIS_NO_EXPORT is now implicitly off, disable explicit off
Travis: Rename TRAVIS_NO_EXPORT to DISABLE_EXPORTERS so its meaning is more obvious
Travis: Remove redundant config
Travis: Remove old attempt at disabling default configurations
FBX: Remove useless const qualifier from return value
GenericProperty: Remove useless const qualifier from return value
Open3DGC: Remove redundant const qualifiers from return types
CMake: Add support for Undefined Behavior sanitizer
Travis: Add Clang UBSan build configuration
B3DImporter: Replace bad pointer casting with memcpy
FBX: Replace bad pointer casting with memcpy
Travis: Add static analysis to build
fast_atof: Silence some uninitialized variable warnings
Travis: Move slower builds earlier to improve parallelization
Travis: Disable unit tests in scan-build config
RemoveRedundantMaterials: Set pointer to nullptr after deleting it
Remove some dead assignments
ImproveCacheLocality: Add assertion to silence a static analyzer warning
RemoveRedundantMaterials: Add assertion to silence a static analyzer warning
OptimizeGraph: Fix possible null pointer dereference
Whitespace
AMFImporter: Add a block
AMFImporter: Add assertion to silence a static analyzer warning
ASE: Add assertion to silence a static analyzer warning
AssbinExporter: Add assertion to silence a static analyzer warning
IRRLoader: Fix confusing boolean casting
LWO: Reduce scope of a variable
NFF: Reduce scope of a variable
Raw: Fix misleading indentation warning
NFF: Split up some complicated assignments
NFF: Add assertions to silence static analyzer warnings
GLTF2: Fix signed/unsigned warning
OpenGEX: Add assertion to silence a static analyzer warning
PLY: Remove dead assignment and reduce scope of a variable
IFC: Remove dead code
FBX: Remove dead assignment
SIBImporter: Add assertions to silence static analyzer warnings
TerragenLoader: Remove unused variable
X3DImporter: Add assertions to silence static analyzer warnings
assimp_cmd: Add assertion to silence a static analyzer warning
OpenDDLParser: Fix potential memory leak
OpenDDLParser: Fix another potential memory leak
OpenDDLParser: Remove dead assignment
Open3DGC: Add assertions to silence static analyzer warnings
OpenDDLExport: Remove dead variable
OpenDDLExport: Reduce scope of a variable
clipper: Add assertion to silence a static analyzer warning
unzip: Fix possibly uninitialized variables
unzip: Bail on bad compression method
unzip: Remove dead assignments
clipper: Add assertion to silence a static analyzer warning
unzip: Remove dead assignment
Unit test: Fix signed/unsigned comparison warnings
Blender: Fix strict-aliasing warnings
FIReader: Fix strict-aliasing warnings
Open3DGC: Fix strict-aliasing warnings
assimp_cmd: Fix strict-aliasing warnings
MDLImporter: Don't take address of packed struct member
BlenderDNA: Silence warning about uninitialized member
Blender: Silence warning about uninitialized member
Unit tests: Enable data structure validation in cases where it doesn't cause failures
BaseImporter: Replace ScopeGuard with std::unique_ptr
BlenderLoader: Replace ScopeGuard with std::unique_ptr
3MF: Replace ScopeGuard with std::unique_ptr
FBX: Replace ScopeGuard with std::unique_ptr
XGLLoader: Replace ScopeGuard with std::unique_ptr
C4D: Replace ScopeGuard with std::unique_ptr
Remove ScopeGuard
Re-enable Clang static analysis
miniz: Remove some dead assignments
Unknown (1):
Misc. typos
Victor NG (4):
Update ColladaExporter.h
Update ColladaExporter.cpp
Update ColladaExporter.cpp
Merge branch 'master' into master
awefers (3):
Fix transform matrices multiplication order per glTF2.0 spec
Preserve node names when importing glTF2.0
Add support for tangents in glTF2.0 import
jamesgk (7):
glTF: start fork of files used in export, for glTF2
Compile with glTF2 export option (currently same as glTF1 output)
Export glTF 2
glTF2: Fix animation export
glTF2: use opacity for diffuse alpha + alphaMode
glTF2: export materials' normal maps
glTF2: Use better mipmap filter defaults
ndotl (4):
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
Merge branch 'master' into adsk-contrib-fix-std-stream-overflow
rickomax (2):
Fixed FBX 7500 Binary reading
Complementing last fix
thomas-lemaire (2):
Merge branch 'master' into master
Merge branch 'master' into ObjExporter_nomtl
turol (7):
Merge pull request #1476 from assimp/revert-1471-clang
Merge pull request #1477 from turol/clang
Merge pull request #1478 from turol/travis
Merge pull request #1480 from turol/ubsan
Merge pull request #1578 from turol/warnings
Merge pull request #1607 from turol/unique_ptr
Merge pull request #1608 from turol/analyze
vkovalev123 (1):
Update 3DSLoader.cpp- Loading branch information
1 parent
0d4d934
commit 7764e06