From a225d2e99e038c57f14a0363d22bcf27aa584a8c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Wed, 9 May 2018 00:40:37 -0500
Subject: [PATCH] =?UTF-8?q?Fix=20compilation=20with=20UBL=20and=20Arc/B?=
=?UTF-8?q?=C3=A9zier?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix #10660
---
Marlin/src/module/planner.h | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/Marlin/src/module/planner.h b/Marlin/src/module/planner.h
index 46950528a4..bb4483c383 100644
--- a/Marlin/src/module/planner.h
+++ b/Marlin/src/module/planner.h
@@ -405,33 +405,25 @@ class Planner {
#endif // SKEW_CORRECTION
#if PLANNER_LEVELING || HAS_UBL_AND_CURVES
-
/**
* Apply leveling to transform a cartesian position
* as it will be given to the planner and steppers.
*/
static void apply_leveling(float &rx, float &ry, float &rz);
FORCE_INLINE static void apply_leveling(float (&raw)[XYZ]) { apply_leveling(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]); }
+ #endif
- #if PLANNER_LEVELING
-
- #define ARG_X float rx
- #define ARG_Y float ry
- #define ARG_Z float rz
-
- static void unapply_leveling(float raw[XYZ]);
-
- #endif
-
+ #if PLANNER_LEVELING
+ #define ARG_X float rx
+ #define ARG_Y float ry
+ #define ARG_Z float rz
+ static void unapply_leveling(float raw[XYZ]);
#else
-
#define ARG_X const float &rx
#define ARG_Y const float &ry
#define ARG_Z const float &rz
-
#endif
-
/**
* Planner::get_next_free_block
*
--
GitLab