Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-08-22 15:04:40 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-08-22 15:07:25 +0300
commit2f195592587c652c7bf84bf26a6805e41773c2d5 (patch)
tree1e1a4b483685bddae57865441bfe76001a614d0b /source/blender/draw/intern/draw_cache_impl_mesh.c
parent9457715d9a6feb574d9f33246842079a9cb15288 (diff)
Cleanup: naming for mesh dirty flags
- NOCHECK -> ALL - ALL -> MAYBE_ALL Where 'MAYBE_ALL' checks to see if the mesh has changed. This is clearer that `BKE_MESH_BATCH_DIRTY_ALL` is dirty and going to be updated without any guess-work.
Diffstat (limited to 'source/blender/draw/intern/draw_cache_impl_mesh.c')
-rw-r--r--source/blender/draw/intern/draw_cache_impl_mesh.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/draw/intern/draw_cache_impl_mesh.c b/source/blender/draw/intern/draw_cache_impl_mesh.c
index f77411c91e8..6b3ef31f8dd 100644
--- a/source/blender/draw/intern/draw_cache_impl_mesh.c
+++ b/source/blender/draw/intern/draw_cache_impl_mesh.c
@@ -1494,8 +1494,8 @@ typedef struct MeshBatchCache {
Gwn_Batch *overlay_paint_edges;
/* settings to determine if cache is invalid */
- bool is_dirty;
- bool is_really_dirty; /* Instantly invalidates cache, skipping mesh check */
+ bool is_maybe_dirty;
+ bool is_dirty; /* Instantly invalidates cache, skipping mesh check */
int edge_len;
int tri_len;
int poly_len;
@@ -1519,18 +1519,18 @@ static bool mesh_batch_cache_valid(Mesh *me)
/* XXX find another place for this */
if (cache->mat_len != mesh_render_mat_len_get(me)) {
- cache->is_dirty = true;
+ cache->is_maybe_dirty = true;
}
if (cache->is_editmode != (me->edit_btmesh != NULL)) {
return false;
}
- if (cache->is_really_dirty) {
+ if (cache->is_dirty) {
return false;
}
- if (cache->is_dirty == false) {
+ if (cache->is_maybe_dirty == false) {
return true;
}
else {
@@ -1572,8 +1572,8 @@ static void mesh_batch_cache_init(Mesh *me)
cache->mat_len = mesh_render_mat_len_get(me);
+ cache->is_maybe_dirty = false;
cache->is_dirty = false;
- cache->is_really_dirty = false;
}
static MeshBatchCache *mesh_batch_cache_get(Mesh *me)
@@ -1592,8 +1592,8 @@ void DRW_mesh_batch_cache_dirty(Mesh *me, int mode)
return;
}
switch (mode) {
- case BKE_MESH_BATCH_DIRTY_ALL:
- cache->is_dirty = true;
+ case BKE_MESH_BATCH_DIRTY_MAYBE_ALL:
+ cache->is_maybe_dirty = true;
break;
case BKE_MESH_BATCH_DIRTY_SELECT:
GWN_VERTBUF_DISCARD_SAFE(cache->ed_tri_data);
@@ -1612,13 +1612,13 @@ void DRW_mesh_batch_cache_dirty(Mesh *me, int mode)
GWN_BATCH_DISCARD_SAFE(cache->edges_with_select_id);
GWN_BATCH_DISCARD_SAFE(cache->verts_with_select_id);
break;
- case BKE_MESH_BATCH_DIRTY_NOCHECK:
- cache->is_really_dirty = true;
+ case BKE_MESH_BATCH_DIRTY_ALL:
+ cache->is_dirty = true;
break;
case BKE_MESH_BATCH_DIRTY_SHADING:
/* TODO: This should only update UV and tangent data,
* and not free the entire cache. */
- cache->is_really_dirty = true;
+ cache->is_dirty = true;
break;
case BKE_MESH_BATCH_DIRTY_SCULPT_COORDS:
cache->is_sculpt_points_tag = true;