tasn pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=b60db90ddc45001db2128f96aa0f5196f844b8c5
commit b60db90ddc45001db2128f96aa0f5196f844b8c5
Author: Tom Hacohen <t...@stosb.com>
Date: Thu Mar 3 12:58:24 2016 +0000
Fix more wrong migration to Eo4.
The if wasn't using {} so one of the statements was out of the scope
of the condition.
There was some misindented code.
---
src/modules/evas/model_loaders/md2/evas_model_load_md2.c | 9 ++++++---
src/modules/evas/model_loaders/obj/evas_model_load_obj.c | 16 ++++++++++------
2 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
index 40a2aa6..02842ad 100644
--- a/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
+++ b/src/modules/evas/model_loaders/md2/evas_model_load_md2.c
@@ -347,15 +347,18 @@ evas_model_load_file_md2(Evas_Canvas3D_Mesh *mesh,
Eina_File *file)
int f = i * MD2_FRAME_SCALE;
/* Add a mesh frame. */
- evas_canvas3d_mesh_frame_add(mesh, f);
+ evas_canvas3d_mesh_frame_add(mesh, f);
+
/* Allocate vertex buffer for the frame. */
- evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION, 0, NULL);
evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
+
/* Map vertex buffer. */
- pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
+ pos = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+
stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, f,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
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 718b8c9..4f1c8f6 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
@@ -380,14 +380,18 @@ evas_model_load_file_obj(Evas_Canvas3D_Mesh *mesh,
Eina_File *file)
stride_pos = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_POSITION);
if (counts.existence_of_normal)
- evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
- nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
- stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
+ {
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL, 0, NULL);
+ nor = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
+ stride_nor = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_NORMAL);
+ }
if (counts.existence_of_tex_point)
- evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
- tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
- stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+ {
+ evas_canvas3d_mesh_frame_vertex_data_copy_set(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD, 0, NULL);
+ tex = (float *)evas_canvas3d_mesh_frame_vertex_data_map(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+ stride_tex = evas_canvas3d_mesh_frame_vertex_stride_get(mesh, 0,
EVAS_CANVAS3D_VERTEX_ATTRIB_TEXCOORD);
+ }
if (stride_pos == 0) stride_pos = sizeof(float) * 3;
if ((counts.existence_of_normal) && (stride_nor == 0))
--
