Skip to content

Commit fe5b4f3

Browse files
Copilotcochcoder
andcommitted
Fix SCALING_FACTOR conflicting declaration between orca_tree_supports.h and libslic3r.h
Co-authored-by: cochcoder <103969142+cochcoder@users.noreply.github.com>
1 parent e36bf14 commit fe5b4f3

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/libslic3r/Support/TreeSupportRust/include/orca_tree_supports.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@
44
#include <ostream>
55
#include <new>
66

7-
/// The scaling factor used to convert between millimetres and internal integer
8-
/// coordinates. Matches the C++ `SCALING_FACTOR` constant.
9-
constexpr static const double SCALING_FACTOR = 1e-6;
10-
117
/// How interface areas interact with support areas.
128
///
139
/// Mirrors the C++ `InterfacePreference` enum.

src/libslic3r/Support/TreeSupportRust/src/utils.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ pub type CoordF = f64;
3939

4040
/// The scaling factor used to convert between millimetres and internal integer
4141
/// coordinates. Matches the C++ `SCALING_FACTOR` constant.
42+
/// cbindgen:ignore
4243
pub const SCALING_FACTOR: f64 = 1e-6;
4344

4445
/// Convert millimetres to internal scaled coordinates.

0 commit comments

Comments
 (0)