[Bf-blender-cvs] [29638fb9181] sculpt-dev: sculpt-dev: fix linux compile error

Joseph Eagar noreply at git.blender.org
Fri Oct 7 18:49:00 CEST 2022


Commit: 29638fb91814c34e8e3e5d434a013a53e8458471
Author: Joseph Eagar
Date:   Fri Oct 7 09:48:45 2022 -0700
Branches: sculpt-dev
https://developer.blender.org/rB29638fb91814c34e8e3e5d434a013a53e8458471

sculpt-dev: fix linux compile error

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

M	source/blender/bmesh/intern/bmesh_mesh_convert_threaded.cc

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

diff --git a/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.cc b/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.cc
index fdb4104483a..1e42f690c0b 100644
--- a/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.cc
+++ b/source/blender/bmesh/intern/bmesh_mesh_convert_threaded.cc
@@ -1,4 +1,4 @@
-#if 1
+#if 0
 #  include "MEM_guardedalloc.h"
 
 #  include "BLI_compiler_attrs.h"
@@ -39,7 +39,7 @@ using blender::Set;
 using blender::Vector;
 using namespace blender::threading;
 
-ATTR_NO_OPT extern "C" void BM_mesh_bm_to_me_threaded(
+extern "C" void BM_mesh_bm_to_me_threaded(
     Main *bmain, Object *ob, BMesh *bm, Mesh *me, const struct BMeshToMeshParams *params)
 {
   BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE | BM_FACE);



More information about the Bf-blender-cvs mailing list