[Bf-blender-cvs] [f86b49d7101] newboolean: Comment out an assert prevents running profiler on Mac.
Howard Trickey
noreply at git.blender.org
Wed Jul 15 02:50:06 CEST 2020
Commit: f86b49d710190536429be8d9c45bf7c698b89260
Author: Howard Trickey
Date: Tue Jul 14 17:16:07 2020 -0400
Branches: newboolean
https://developer.blender.org/rBf86b49d710190536429be8d9c45bf7c698b89260
Comment out an assert prevents running profiler on Mac.
Not sure why this assert is not known to the compiler used
when profiling.
===================================================================
M source/blender/blenlib/intern/math_vector.c
M tests/gtests/blenlib/BLI_mesh_intersect_test.cc
===================================================================
diff --git a/source/blender/blenlib/intern/math_vector.c b/source/blender/blenlib/intern/math_vector.c
index 1e96dd1368e..16ccea8aa39 100644
--- a/source/blender/blenlib/intern/math_vector.c
+++ b/source/blender/blenlib/intern/math_vector.c
@@ -811,7 +811,7 @@ void reflect_v3_v3v3_db(double out[3], const double v[3], const double normal[3]
{
const double dot2 = 2.0 * dot_v3v3_db(v, normal);
- BLI_ASSERT_UNIT_V3_DB(normal);
+ /* BLI_ASSERT_UNIT_V3_DB(normal); this assert is not knownn? */
out[0] = v[0] - (dot2 * normal[0]);
out[1] = v[1] - (dot2 * normal[1]);
diff --git a/tests/gtests/blenlib/BLI_mesh_intersect_test.cc b/tests/gtests/blenlib/BLI_mesh_intersect_test.cc
index 4120c148582..a00ceacdbbe 100644
--- a/tests/gtests/blenlib/BLI_mesh_intersect_test.cc
+++ b/tests/gtests/blenlib/BLI_mesh_intersect_test.cc
@@ -14,7 +14,7 @@
#include "BLI_mpq3.hh"
#include "BLI_vector.hh"
-#define DO_REGULAR_TESTS 1
+#define DO_REGULAR_TESTS 0
#define DO_PERF_TESTS 1
namespace blender::meshintersect {
@@ -794,18 +794,18 @@ static void spheresphere_test(int nrings, double y_offset)
}
Mesh mesh(faces);
double time_create = PIL_check_seconds_timer();
- write_obj_mesh(mesh, "icosphere_in");
+ /* write_obj_mesh(mesh, "spheresphere_in"); */
Mesh out = trimesh_self_intersect(mesh, &arena);
double time_intersect = PIL_check_seconds_timer();
std::cout << "Create time: " << time_create - time_start << "\n";
std::cout << "Intersect time: " << time_intersect - time_create << "\n";
std::cout << "Total time: " << time_intersect - time_start << "\n";
- write_obj_mesh(out, "icosphere");
+ /* write_obj_mesh(out, "spheresphere"); */
}
TEST(mesh_intersect_perf, SphereSphere)
{
- spheresphere_test(16, 0.5);
+ spheresphere_test(64, 0.5);
}
#endif
More information about the Bf-blender-cvs
mailing list