diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-25 11:32:34 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-09-25 11:32:34 +0300 |
commit | 15792eb728c8901f1d03abda250c7c1d3b0b2cfc (patch) | |
tree | 9abf77d467a43e242d7ad83453e0039dc0a55762 /source | |
parent | 43c4d0bf23c2dd8230f58a07b55d1234c1e81acf (diff) |
Cleanup: Variable name in mesh runtime
Matches type better, avoiding possible confusion.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/blenkernel/intern/mesh_runtime.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/multires.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/paint.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/subdiv_ccg.c | 2 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_mesh_types.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/source/blender/blenkernel/intern/mesh_runtime.c b/source/blender/blenkernel/intern/mesh_runtime.c index f52e0addc74..f74be727362 100644 --- a/source/blender/blenkernel/intern/mesh_runtime.c +++ b/source/blender/blenkernel/intern/mesh_runtime.c @@ -198,9 +198,9 @@ void BKE_mesh_runtime_clear_geometry(Mesh *mesh) bvhcache_free(&mesh->runtime.bvh_cache); MEM_SAFE_FREE(mesh->runtime.looptris.array); /* TODO(sergey): Does this really belong here? */ - if (mesh->runtime.subsurf_ccg != NULL) { - BKE_subdiv_ccg_destroy(mesh->runtime.subsurf_ccg); - mesh->runtime.subsurf_ccg = NULL; + if (mesh->runtime.subdiv_ccg != NULL) { + BKE_subdiv_ccg_destroy(mesh->runtime.subdiv_ccg); + mesh->runtime.subdiv_ccg = NULL; } } diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 3f3feddcfbe..2aa3b3f79a3 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -410,7 +410,7 @@ void multires_mark_as_modified(Object *ob, MultiresModifiedFlags flags) return; } Mesh *mesh = ob->data; - SubdivCCG *subdiv_ccg = mesh->runtime.subsurf_ccg; + SubdivCCG *subdiv_ccg = mesh->runtime.subdiv_ccg; if (subdiv_ccg == NULL) { return; } diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index d843ae5173f..c9f72ccf4ab 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -943,7 +943,7 @@ void BKE_sculpt_update_mesh_elements( ss->vmask = CustomData_get_layer(&me->vdata, CD_PAINT_MASK); } - ss->subdiv_ccg = me_eval->runtime.subsurf_ccg; + ss->subdiv_ccg = me_eval->runtime.subdiv_ccg; PBVH *pbvh = BKE_sculpt_object_pbvh_ensure(depsgraph, ob); BLI_assert(pbvh == ss->pbvh); @@ -1223,8 +1223,8 @@ PBVH *BKE_sculpt_object_pbvh_ensure(Depsgraph *depsgraph, Object *ob) else { Object *object_eval = DEG_get_evaluated_object(depsgraph, ob); Mesh *mesh_eval = object_eval->data; - if (mesh_eval->runtime.subsurf_ccg != NULL) { - pbvh = build_pbvh_from_ccg(ob, mesh_eval->runtime.subsurf_ccg); + if (mesh_eval->runtime.subdiv_ccg != NULL) { + pbvh = build_pbvh_from_ccg(ob, mesh_eval->runtime.subdiv_ccg); } else if (ob->type == OB_MESH) { Mesh *me_eval_deform = mesh_get_eval_deform( diff --git a/source/blender/blenkernel/intern/subdiv_ccg.c b/source/blender/blenkernel/intern/subdiv_ccg.c index 00ac9c49b83..edac9747f68 100644 --- a/source/blender/blenkernel/intern/subdiv_ccg.c +++ b/source/blender/blenkernel/intern/subdiv_ccg.c @@ -687,7 +687,7 @@ Mesh *BKE_subdiv_to_ccg_mesh( } Mesh *result = BKE_mesh_new_nomain_from_template( coarse_mesh, 0, 0, 0, 0, 0); - result->runtime.subsurf_ccg = subdiv_ccg; + result->runtime.subdiv_ccg = subdiv_ccg; return result; } diff --git a/source/blender/makesdna/DNA_mesh_types.h b/source/blender/makesdna/DNA_mesh_types.h index be190d656b4..816a589ee16 100644 --- a/source/blender/makesdna/DNA_mesh_types.h +++ b/source/blender/makesdna/DNA_mesh_types.h @@ -84,7 +84,7 @@ struct MLoopTri_Store { typedef struct Mesh_Runtime { struct EditMeshData *edit_data; void *batch_cache; - struct SubdivCCG *subsurf_ccg; + struct SubdivCCG *subdiv_ccg; void *pad1; int64_t cd_dirty_vert; |