From 2a448448702a1805a9d249f1a49b5f886feb146c Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 25 Aug 2014 14:05:00 +0600 Subject: Fix T41532: Some files bounce back and forth between 'packing BVH nodes' and 'Copying Transforms to Device' This was originally caused by a6ae12a where i didn't foresee unclear distinguishing between empty and non-synced meshes will give issues for the viewport. They're the same for final rendering, but for viewport we need to be accurate here. --- intern/cycles/blender/blender_mesh.cpp | 5 ++--- intern/cycles/render/mesh.cpp | 1 + intern/cycles/render/mesh.h | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) (limited to 'intern') diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index 0f7d14ee411..a5e4b7bd2ae 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -529,14 +529,12 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri Mesh *mesh; if(!mesh_map.sync(&mesh, key)) { - bool have_geometry = mesh->verts.size() != 0; - /* if transform was applied to mesh, need full update */ if(object_updated && mesh->transform_applied); /* test if shaders changed, these can be object level so mesh * does not get tagged for recalc */ else if(mesh->used_shaders != used_shaders); - else if(use_mesh_geometry != have_geometry); + else if(use_mesh_geometry != mesh->geometry_synced); else { /* even if not tagged for recalc, we may need to sync anyway * because the shader needs different mesh attributes */ @@ -599,6 +597,7 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated, bool hide_tri /* free derived mesh */ b_data.meshes.remove(b_mesh); } + mesh->geometry_synced = true; } /* displacement method */ diff --git a/intern/cycles/render/mesh.cpp b/intern/cycles/render/mesh.cpp index 273443034c5..8299cd02fef 100644 --- a/intern/cycles/render/mesh.cpp +++ b/intern/cycles/render/mesh.cpp @@ -132,6 +132,7 @@ void Mesh::clear() transform_applied = false; transform_negative_scaled = false; transform_normal = transform_identity(); + geometry_synced = false; } int Mesh::split_vertex(int vertex) diff --git a/intern/cycles/render/mesh.h b/intern/cycles/render/mesh.h index 5ee774bacc1..d45905611fa 100644 --- a/intern/cycles/render/mesh.h +++ b/intern/cycles/render/mesh.h @@ -71,6 +71,9 @@ public: ustring name; /* Mesh Data */ + bool geometry_synced; /* used to distinguish meshes with no verts + and meshed for which geometry is not created */ + vector verts; vector triangles; vector shader; -- cgit v1.2.3