[Bf-blender-cvs] [92404a0] temp-cycles-microdisplacement: Keep size of vert_patch_uv in sync to avoid triggering assert

Mai Lavelle noreply at git.blender.org
Fri Jun 24 19:26:46 CEST 2016


Commit: 92404a092fe5a8a6717300e2cf7bf93412ca4781
Author: Mai Lavelle
Date:   Thu Jun 23 01:29:49 2016 -0400
Branches: temp-cycles-microdisplacement
https://developer.blender.org/rB92404a092fe5a8a6717300e2cf7bf93412ca4781

Keep size of vert_patch_uv in sync to avoid triggering assert

===================================================================

M	intern/cycles/render/mesh.cpp

===================================================================

diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp
index a71d7ce..f8e4993 100644
--- a/intern/cycles/render/mesh.cpp
+++ b/intern/cycles/render/mesh.cpp
@@ -273,11 +273,19 @@ int Mesh::split_vertex(int vertex)
 void Mesh::add_vertex(float3 P)
 {
 	verts.push_back_reserved(P);
+
+	if(subd_faces.size()) {
+		vert_patch_uv.push_back_reserved(make_float2(0.0f, 0.0f));
+	}
 }
 
 void Mesh::add_vertex_slow(float3 P)
 {
 	verts.push_back_slow(P);
+
+	if(subd_faces.size()) {
+		vert_patch_uv.push_back_slow(make_float2(0.0f, 0.0f));
+	}
 }
 
 void Mesh::add_triangle(int v0, int v1, int v2, int shader_, bool smooth_)




More information about the Bf-blender-cvs mailing list