blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 750 Projects 19 Wiki Activity

Cleanup: Variable name in mesh runtime 

Matches type better, avoiding possible confusion.
This commit is contained in:
Sergey Sharybin 2018-09-25 10:32:34 +02:00
parent 43c4d0bf23
commit 15792eb728
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/intern/mesh_runtime.c
View File

@ -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;
}
}

2
source/blender/blenkernel/intern/multires.c
View File

@ -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;
}

6
source/blender/blenkernel/intern/paint.c
View File

@ -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(

2
source/blender/blenkernel/intern/subdiv_ccg.c
View File

@ -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;
}

2
source/blender/makesdna/DNA_mesh_types.h
View File

@ -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;