Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWeizhen Huang <itsnotrj@gmail.com>2022-11-11 18:17:58 +0300
committerWeizhen Huang <itsnotrj@gmail.com>2022-11-11 18:17:58 +0300
commitdad3574a8c0b673efa9d7f7c890d9562e3f6a267 (patch)
tree84dff4a90c34a44744c329de21a999289f9d209a /source/blender/io/collada/MeshImporter.cpp
parente9260afa93068d0181de6e3223f65e7bb016aecc (diff)
parentdc8a1d38b73420428f9fb878386b99ebb69dd841 (diff)
Merge branch 'master' into soc-2022-many-lights-sampling
Diffstat (limited to 'source/blender/io/collada/MeshImporter.cpp')
-rw-r--r--source/blender/io/collada/MeshImporter.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/io/collada/MeshImporter.cpp b/source/blender/io/collada/MeshImporter.cpp
index 6d7593afb8b..1a28adf50a5 100644
--- a/source/blender/io/collada/MeshImporter.cpp
+++ b/source/blender/io/collada/MeshImporter.cpp
@@ -564,7 +564,7 @@ void MeshImporter::mesh_add_edges(Mesh *mesh, int len)
/* set default flags */
medge = &edges[mesh->totedge];
for (int i = 0; i < len; i++, medge++) {
- medge->flag = ME_EDGEDRAW | ME_EDGERENDER;
+ medge->flag = ME_EDGEDRAW;
}
mesh->totedge = totedge;