diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-05 21:14:00 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2019-03-05 21:14:00 +0300 |
| commit | 3428ec5984c0b7bac37fa860c660652f822919a9 (patch) | |
| tree | c0ca0f2ee4781f823cb658fca1bfbdb9614b010d /intern/cycles/app | |
| parent | 5e8e3c00f2aa8331148c59db40a9ee43ee55438e (diff) | |
| parent | e290a0b0568ecfcf47aa55b059de468b2c651e19 (diff) | |
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/app')
| -rw-r--r-- | intern/cycles/app/cycles_xml.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp index 895a83818df..d4ee284e24b 100644 --- a/intern/cycles/app/cycles_xml.cpp +++ b/intern/cycles/app/cycles_xml.cpp @@ -442,7 +442,7 @@ static void xml_read_mesh(const XMLReadState& state, xml_node node) if(xml_read_float_array(UV, node, "UV")) { ustring name = ustring("UVMap"); Attribute *attr = mesh->attributes.add(ATTR_STD_UV, name); - float3 *fdata = attr->data_float3(); + float2 *fdata = attr->data_float2(); /* loop over the triangles */ index_offset = 0; @@ -456,9 +456,9 @@ static void xml_read_mesh(const XMLReadState& state, xml_node node) assert(v1*2+1 < (int)UV.size()); assert(v2*2+1 < (int)UV.size()); - fdata[0] = make_float3(UV[v0*2], UV[v0*2+1], 0.0); - fdata[1] = make_float3(UV[v1*2], UV[v1*2+1], 0.0); - fdata[2] = make_float3(UV[v2*2], UV[v2*2+1], 0.0); + fdata[0] = make_float2(UV[v0*2], UV[v0*2+1]); + fdata[1] = make_float2(UV[v1*2], UV[v1*2+1]); + fdata[2] = make_float2(UV[v2*2], UV[v2*2+1]); fdata += 3; } |