[Bf-blender-cvs] [17e1c97e435] master: Cleanup: remove USE_TESSFACE_DEFAULT define

Campbell Barton noreply at git.blender.org
Sun Aug 25 09:03:02 CEST 2019


Commit: 17e1c97e435d20758ca2959496cc1b09268add3d
Author: Campbell Barton
Date:   Sun Aug 25 12:21:09 2019 +1000
Branches: master
https://developer.blender.org/rB17e1c97e435d20758ca2959496cc1b09268add3d

Cleanup: remove USE_TESSFACE_DEFAULT define

===================================================================

M	source/blender/blenloader/intern/readfile.c
M	source/blender/editors/mesh/editmesh_utils.c
M	source/blender/makesdna/DNA_mesh_types.h

===================================================================

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 1e3342cef04..fe9235ba59a 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4895,21 +4895,8 @@ static void lib_link_mesh(FileData *fd, Main *main)
         G_MAIN = gmain;
       }
 
-      /*
-       * Re-tessellate, even if the polys were just created from tessfaces, this
-       * is important because it:
-       * - fill the CD_ORIGINDEX layer
-       * - gives consistency of tessface between loading from a file and
-       *   converting an edited BMesh back into a mesh (i.e. it replaces
-       *   quad tessfaces in a loaded mesh immediately, instead of lazily
-       *   waiting until edit mode has been entered/exited, making it easier
-       *   to recognize problems that would otherwise only show up after edits).
-       */
-#ifdef USE_TESSFACE_DEFAULT
-      BKE_mesh_tessface_calc(me);
-#else
+      /* Deprecated, only kept for conversion. */
       BKE_mesh_tessface_clear(me);
-#endif
 
       me->id.tag &= ~LIB_TAG_NEED_LINK;
     }
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index d7ed14184fa..2691c10cfb4 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -347,10 +347,6 @@ void EDBM_mesh_load(Main *bmain, Object *ob)
                        .calc_object_remap = true,
                    }));
 
-#ifdef USE_TESSFACE_DEFAULT
-  BKE_mesh_tessface_calc(me);
-#endif
-
   /* Free derived mesh. usually this would happen through depsgraph but there
    * are exceptions like file save that will not cause this, and we want to
    * avoid ending up with an invalid derived mesh then.
diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h
index caa7c98335a..39bcec8bb45 100644
--- a/source/blender/makesdna/DNA_mesh_types.h
+++ b/source/blender/makesdna/DNA_mesh_types.h
@@ -270,10 +270,4 @@ enum {
 
 #define MESH_MAX_VERTS 2000000000L
 
-/* this is so we can save bmesh files that load in trunk, ignoring NGons
- * will eventually be removed */
-
-/* enable this so meshes get tessfaces calculated by default */
-/* #define USE_TESSFACE_DEFAULT */
-
 #endif



More information about the Bf-blender-cvs mailing list