[Bf-blender-cvs] [accadbc2aac] newboolean: Used wrong #if to isolate debugging code for Windows.
Howard Trickey
noreply at git.blender.org
Sun Jul 26 12:38:37 CEST 2020
Commit: accadbc2aacdf06859500cbc7a891f5d73d9ea0c
Author: Howard Trickey
Date: Sun Jul 26 06:38:02 2020 -0400
Branches: newboolean
https://developer.blender.org/rBaccadbc2aacdf06859500cbc7a891f5d73d9ea0c
Used wrong #if to isolate debugging code for Windows.
===================================================================
M source/blender/blenlib/intern/delaunay_2d.cc
M source/blender/blenlib/intern/mesh_intersect.cc
===================================================================
diff --git a/source/blender/blenlib/intern/delaunay_2d.cc b/source/blender/blenlib/intern/delaunay_2d.cc
index bc33004a8a8..11be4f99d56 100644
--- a/source/blender/blenlib/intern/delaunay_2d.cc
+++ b/source/blender/blenlib/intern/delaunay_2d.cc
@@ -387,7 +387,7 @@ template<typename T> void cdt_draw(const std::string &label, const CDTArrangemen
/* Would like to use BKE_tempdir_base() here, but that brings in dependence on kernel library.
* This is just for developer debugging anyway, and should never be called in production Blender.
*/
-# if WIN32
+# ifdef _WIN32
const char *drawfile = "./debug_draw.html";
# else
const char *drawfile = "/tmp/debug_draw.html";
diff --git a/source/blender/blenlib/intern/mesh_intersect.cc b/source/blender/blenlib/intern/mesh_intersect.cc
index b19f254fe83..eb3bb0a7d63 100644
--- a/source/blender/blenlib/intern/mesh_intersect.cc
+++ b/source/blender/blenlib/intern/mesh_intersect.cc
@@ -2695,7 +2695,7 @@ void write_obj_mesh(Mesh &m, const std::string &objname)
/* Would like to use BKE_tempdir_base() here, but that brings in dependence on kernel library.
* This is just for developer debugging anyway, and should never be called in production Blender.
*/
-#if WIN_32
+#ifdef _WIN_32
const char *objdir = BLI_getenv("HOME");
#else
const char *objdir = "/tmp/";
More information about the Bf-blender-cvs
mailing list