diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-03 19:31:45 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-10-03 19:31:45 +0400 |
| commit | da8f71bffb1a33c695a368c1243b8aa9ac54c21d (patch) | |
| tree | 988f91e51c03a676fef598ce1e9b03f245244c0a /intern/cycles/blender/blender_mesh.cpp | |
| parent | 590b7ff102c0ac5ee1f45ef8e43664afd9131251 (diff) | |
Cycles: some tweaks to silence msvc assertions in debug mode.
Diffstat (limited to 'intern/cycles/blender/blender_mesh.cpp')
| -rw-r--r-- | intern/cycles/blender/blender_mesh.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/intern/cycles/blender/blender_mesh.cpp b/intern/cycles/blender/blender_mesh.cpp index f981be66eb4..6e99b380c29 100644 --- a/intern/cycles/blender/blender_mesh.cpp +++ b/intern/cycles/blender/blender_mesh.cpp @@ -268,9 +268,10 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated) vector<Mesh::Triangle> oldtriangle = mesh->triangles; + mesh->clear(); mesh->used_shaders = used_shaders; - mesh->name = ustring(b_ob_data.name()); + mesh->name = ustring(b_ob_data.name().c_str()); if(b_mesh) { if(cmesh.data && RNA_boolean_get(&cmesh, "use_subdivision")) @@ -299,8 +300,10 @@ Mesh *BlenderSync::sync_mesh(BL::Object b_ob, bool object_updated) if(oldtriangle.size() != mesh->triangles.size()) rebuild = true; - else if(memcmp(&oldtriangle[0], &mesh->triangles[0], sizeof(Mesh::Triangle)*oldtriangle.size()) != 0) - rebuild = true; + else if(oldtriangle.size()) { + if(memcmp(&oldtriangle[0], &mesh->triangles[0], sizeof(Mesh::Triangle)*oldtriangle.size()) != 0) + rebuild = true; + } mesh->tag_update(scene, rebuild); |