Merge remote-tracking branch 'refs/remotes/origin/master' into dev

a722cc95 · MagoKimbra · 75844245 · 15eb1a5f · a722cc95
Commit a722cc95 authored Mar 20, 2016 by MagoKimbra
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

MK_Main.cpp MK/module/MK_Main.cpp +0 -5

No files found.
--- a/MK/module/MK_Main.cpp
+++ b/MK/module/MK_Main.cpp
@@ -2863,11 +2863,6 @@ void gcode_get_destination() {
    destination[E_AXIS] = (code_value() * density_multiplier[previous_extruder] / 100) + current_position[E_AXIS];
  }

-  // Get ABCDHI mixing factors
-  #if ENABLED(COLOR_MIXING_EXTRUDER)
-    gcode_get_mix();
-  #endif
-
  printer_usage_filament += (destination[E_AXIS] - current_position[E_AXIS]);

  #if ENABLED(RFID_MODULE)