diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-11-01 07:59:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-01 07:59:39 +0100 |
| commit | fc6ef93cc84c415519f05e38ecd3d91a9fe196f1 (patch) | |
| tree | 6bf20b88e825c1d2fc74deaf49444103bcd9ab46 /editor/import/resource_importer_scene.h | |
| parent | f8ed1144dfb0497d7b6f7b8254cf509596682a9f (diff) | |
| parent | ef90965883d367117000e26d9d909742b0eedd7a (diff) | |
Merge pull request #12548 from SaracenOne/vertex_compression_import_fix
Restores functionality of the use_compression flag in Collada import
Diffstat (limited to 'editor/import/resource_importer_scene.h')
| -rw-r--r-- | editor/import/resource_importer_scene.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/editor/import/resource_importer_scene.h b/editor/import/resource_importer_scene.h index 9c7e791719..5bf3145148 100644 --- a/editor/import/resource_importer_scene.h +++ b/editor/import/resource_importer_scene.h @@ -51,7 +51,8 @@ public: IMPORT_ANIMATION_KEEP_VALUE_TRACKS = 32, IMPORT_GENERATE_TANGENT_ARRAYS = 256, IMPORT_FAIL_ON_MISSING_DEPENDENCIES = 512, - IMPORT_MATERIALS_IN_INSTANCES = 1024 + IMPORT_MATERIALS_IN_INSTANCES = 1024, + IMPORT_USE_COMPRESSION = 2048 }; |