Merge branch 'blender-v3.6-release'

6099sin · Jun 26, 2023 · 1bea1f7 · 1bea1f7
2 parents c5bc19f + 463f949
commit 1bea1f7
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/addons/io_scene_gltf2/__init__.py b/addons/io_scene_gltf2/__init__.py
@@ -15,7 +15,7 @@
 bl_info = {
     'name': 'glTF 2.0 format',
     'author': 'Julien Duroure, Scurest, Norbert Nopper, Urs Hanselmann, Moritz Becher, Benjamin Schmithüsen, Jim Eckerlein, and many external contributors',
-    "version": (4, 0, 4),
+    "version": (4, 0, 5),
     'blender': (3, 5, 0),
     'location': 'File > Import-Export',
     'description': 'Import-Export as glTF 2.0',

diff --git a/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py b/addons/io_scene_gltf2/blender/imp/gltf2_blender_mesh.py
@@ -652,7 +652,8 @@ def set_poly_smoothing(gltf, pymesh, mesh, vert_normals, loop_vidxs):
     num_polys = len(mesh.polygons)
 
     if gltf.import_settings['import_shading'] == "FLAT":
-        # Polys are flat by default; don't have to do anything
+        # Polys are smooth by default, setting to flat
+        mesh.shade_flat()
         return
 
     if gltf.import_settings['import_shading'] == "SMOOTH":

diff --git a/tests/test/test.js b/tests/test/test.js
@@ -2798,7 +2798,7 @@ describe('Importer / Exporter (Roundtrip)', function() {
                 assert.strictEqual(asset.meshes.length, 1);
                 assert.strictEqual(asset.meshes[0].primitives.length, 2);
                 const primitive1 = asset.meshes[0].primitives[0];
-                assert.strictEqual(asset.accessors[primitive1.attributes['_PRESSURE']].count, 4);
+                assert.strictEqual(asset.accessors[primitive1.attributes['_PRESSURE']].count, 12);
                 const primitive2 = asset.meshes[0].primitives[1];
                 assert.strictEqual(asset.accessors[primitive2.attributes['_PRESSURE']].count, 4);
             });