[EGIT] [core/efl] master 02/03: evas-3d: fix incorrect reading of .obj file which had an empty line before data in unix encoding.

[Bogdan Devichev]

cedric pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=5eba6ae468e884d6e5015578fa3e37b53548c9f1

commit 5eba6ae468e884d6e5015578fa3e37b53548c9f1
Author: Bogdan Devichev <b.devic...@samsung.com>
Date:   Thu Feb 26 20:27:11 2015 +0100

    evas-3d: fix incorrect reading of .obj file which had an empty line before 
data in unix encoding.
    
    Summary:
    For example of a bug, part of .obj file:
    vn 0.5536 -0.7200 -0.4185\n
    vn -0.5536 -0.7200 -0.4185\n
    \# 239 vertex normals\n
    \n
    vt 0.4998 0.2618 0.0000\n(lines like this were ignored)
    vt 0.5205 0.2550 0.0000\n
    vt 0.5249 0.2618 0.0000\n
    
    @fix
    
    Test Plan: Run colorpick example. Before and after this update. ("M15.obj" 
has fixed places.)
    
    Reviewers: cedric, Hermet, raster
    
    Subscribers: cedric
    
    Differential Revision: https://phab.enlightenment.org/D2049
    
    Signed-off-by: Cedric BAIL <ced...@osg.samsung.com>
---
 src/modules/evas/model_loaders/obj/evas_model_load_obj.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c 
b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
index b88f95b..e1fdf48 100644
--- a/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
+++ b/src/modules/evas/model_loaders/obj/evas_model_load_obj.c
@@ -176,7 +176,7 @@ _count_elements(char *map)//count elements of mesh in .obj
                     }
                }
           }
-        else if (*current == '\n')
+        if (*current == '\n')
           {
              will_check_next_char = EINA_TRUE;
           }
@@ -364,7 +364,7 @@ evas_model_load_file_obj(Evas_3D_Mesh *mesh, Eina_File 
*file)
                     }
                }
           }
-        else if (*current == '\n')
+        if (*current == '\n')
           {
              will_check_next_char = EINA_TRUE;
           }

--