Fixed conflicts after merge with master and ported changes into gouraud shaders to gouraud_mod shaders

src/libslic3r/GCode/GCodeProcessor.cpp

@@ -1267,7 +1267,7 @@ void GCodeProcessor::process_file(const std::string& filename, std::function<voi
                 cancel_callback();
         }
         this->process_gcode_line(line, true);
-    });
+    }, m_result.lines_ends);
 
     // Don't post-process the G-code to update time stamps.
     this->finalize(false);