[Bf-blender-cvs] [96e3643] compositor-2016: Fix T48334: Cycles standalone xml import of uv coordinates
Sergey Sharybin
noreply at git.blender.org
Wed Jun 8 21:49:33 CEST 2016
Commit: 96e3643cfa9e88692825cae6277229513b85529c
Author: Sergey Sharybin
Date: Mon May 23 13:38:15 2016 +0200
Branches: compositor-2016
https://developer.blender.org/rB96e3643cfa9e88692825cae6277229513b85529c
Fix T48334: Cycles standalone xml import of uv coordinates
In Cycle standalone, the xml import of uv's is done in a way that
a vertex could only have one unique uv coordinate. In practice it
is most of the time not the case.
Patch by Laurent Boiron, thanks!
===================================================================
M intern/cycles/app/cycles_xml.cpp
===================================================================
diff --git a/intern/cycles/app/cycles_xml.cpp b/intern/cycles/app/cycles_xml.cpp
index dc0c4f6..f734d01 100644
--- a/intern/cycles/app/cycles_xml.cpp
+++ b/intern/cycles/app/cycles_xml.cpp
@@ -936,9 +936,9 @@ static void xml_read_mesh(const XMLReadState& state, pugi::xml_node node)
index_offset = 0;
for(size_t i = 0; i < nverts.size(); i++) {
for(int j = 0; j < nverts[i]-2; j++) {
- int v0 = verts[index_offset];
- int v1 = verts[index_offset + j + 1];
- int v2 = verts[index_offset + j + 2];
+ int v0 = index_offset;
+ int v1 = index_offset + j + 1;
+ int v2 = index_offset + j + 2;
assert(v0*2+1 < (int)UV.size());
assert(v1*2+1 < (int)UV.size());
More information about the Bf-blender-cvs
mailing list