Browse Source

Patch fade_factor compiler warning

Scott Lahteine 8 years ago
parent
commit
7b625e0048
1 changed files with 5 additions and 3 deletions
  1. 5
    3
      Marlin/planner.cpp

+ 5
- 3
Marlin/planner.cpp View File

@@ -556,8 +556,6 @@ void Planner::check_axes_activity() {
556 556
       }
557 557
       else
558 558
         z_fade_factor = 1.0;
559
-    #else
560
-        constexpr float z_fade_factor = 1.0;
561 559
     #endif
562 560
 
563 561
     #if ENABLED(MESH_BED_LEVELING)
@@ -584,7 +582,11 @@ void Planner::check_axes_activity() {
584 582
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
585 583
 
586 584
       float tmp[XYZ] = { lx, ly, 0 };
587
-      lz += bilinear_z_offset(tmp) * z_fade_factor;
585
+      lz += bilinear_z_offset(tmp)
586
+        #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
587
+          * z_fade_factor
588
+        #endif
589
+      ;
588 590
 
589 591
     #endif
590 592
   }

Loading…
Cancel
Save