[Bf-blender-cvs] [4c0c4e7f9fe] master: Mesh Batch Cache: Fix wrong assert
Clément Foucault
noreply at git.blender.org
Fri Jan 11 16:00:32 CET 2019
Commit: 4c0c4e7f9fed6e675d11363865594fb294bdc4b6
Author: Clément Foucault
Date: Sat Dec 22 21:04:53 2018 +0100
Branches: master
https://developer.blender.org/rB4c0c4e7f9fed6e675d11363865594fb294bdc4b6
Mesh Batch Cache: Fix wrong assert
===================================================================
M source/blender/draw/intern/draw_cache_impl_mesh.c
===================================================================
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index 54f42c310e1..be37787ae7c 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1182,12 +1182,12 @@ static int mesh_render_data_verts_len_get_maybe_mapped(const MeshRenderData *rda
static int UNUSED_FUNCTION(mesh_render_data_loose_verts_len_get)(const MeshRenderData *rdata)
{
- BLI_assert(rdata->types & MR_DATATYPE_OVERLAY);
+ BLI_assert(rdata->types & MR_DATATYPE_LOOSE_VERT);
return rdata->loose_vert_len;
}
static int mesh_render_data_loose_verts_len_get_maybe_mapped(const MeshRenderData *rdata)
{
- BLI_assert(rdata->types & MR_DATATYPE_OVERLAY);
+ BLI_assert(rdata->types & MR_DATATYPE_LOOSE_VERT);
return ((rdata->mapped.use == false) ? rdata->loose_vert_len : rdata->mapped.loose_vert_len);
}
@@ -1204,12 +1204,12 @@ static int mesh_render_data_edges_len_get_maybe_mapped(const MeshRenderData *rda
static int UNUSED_FUNCTION(mesh_render_data_loose_edges_len_get)(const MeshRenderData *rdata)
{
- BLI_assert(rdata->types & MR_DATATYPE_OVERLAY);
+ BLI_assert(rdata->types & MR_DATATYPE_LOOSE_EDGE);
return rdata->loose_edge_len;
}
static int mesh_render_data_loose_edges_len_get_maybe_mapped(const MeshRenderData *rdata)
{
- BLI_assert(rdata->types & MR_DATATYPE_OVERLAY);
+ BLI_assert(rdata->types & MR_DATATYPE_LOOSE_EDGE);
return ((rdata->mapped.use == false) ? rdata->loose_edge_len : rdata->mapped.loose_edge_len);
}
More information about the Bf-blender-cvs
mailing list