Fixed compilation errors.

Author: FractalFir

src/model_importer.rs

@@ -129,20 +129,16 @@ impl ModelImporter {
                 Ok(())
             }
             _ => {
-<<<<<<< HEAD
-=======
                 #[cfg(not(feature = "triangulation"))]
                 {
-                    Err("Encountered a face that needed triangulation but experimental triangulation feature is disabled".to_owned())
+                    return Err("Encountered a face that needed triangulation but experimental triangulation feature is disabled".to_owned());
                 }
->>>>>>> 17bad1f (Bugfixes + laid some basic groundwork for tmf segment lader/unloader)
                 #[cfg(feature = "triangulation")]
                 {
                     let vertex_indices = SmallVec::from_slice(vertex_indices);
                     let normal_indices = SmallVec::from_slice(normal_indices);
                     let uv_indices = SmallVec::from_slice(uv_indices);
                     triangulate(self, vertex_indices, normal_indices, uv_indices);
-
                     Ok(())
                 }
                 #[cfg(not(feature = "triangulation"))]

src/tmf.rs

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #[repr(u16)]
 #[derive(Debug)]
 pub(crate) enum SectionType {
@@ -42,9 +41,7 @@ impl CompressionType {
         }
     }
 }
-=======
 use crate::tmf_segment::*;
->>>>>>> 17bad1f (Bugfixes + laid some basic groundwork for tmf segment lader/unloader)
 fn read_segment_header<R: Read>(reader: &mut R) -> Result<(SectionType, usize, CompressionType)> {
     let seg_type = read_u16(reader)?;
     let seg_type = SectionType::from_u16(seg_type);

src/utilis.rs

@@ -23,7 +23,7 @@ pub(crate) fn fast_prune<T: Sized>(data: &mut Vec<T>, indices: &mut [IndexType])
 }
 #[allow(non_camel_case_types)]
 #[cfg(feature = "fast_trig")]
-type fprec = f64;
+pub(crate) type fprec = f64;
 #[cfg(feature = "fast_trig")]
 #[cfg(feature = "fast_trig")]
 const F_PI: fprec = std::f64::consts::PI;