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:
authorSergey Sharybin <sergey.vfx@gmail.com>2020-02-28 14:05:48 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2020-02-28 14:24:26 +0300
commitfeead324fd70289d7dbcbe2b797cc960d6be99ca (patch)
tree9c2aa69ce9b491bbf5a3d880ed73fdae5274d14d /source/blender/blenkernel/intern/multires.c
parentd9c25f0192f4f16337f65630b8d405e2d3b6e69d (diff)
Multires: Cleanup, naming
Diffstat (limited to 'source/blender/blenkernel/intern/multires.c')
-rw-r--r--source/blender/blenkernel/intern/multires.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index 96608a931ab..35de0d19d95 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -406,27 +406,27 @@ void multires_mark_as_modified(Depsgraph *depsgraph, Object *object, MultiresMod
multires_ccg_mark_as_modified(subdiv_ccg, flags);
}
-void multires_flush_sculpt_updates(Object *ob)
+void multires_flush_sculpt_updates(Object *object)
{
- if (ob && ob->sculpt && ob->sculpt->pbvh != NULL) {
- SculptSession *sculpt_session = ob->sculpt;
+ if (object && object->sculpt && object->sculpt->pbvh != NULL) {
+ SculptSession *sculpt_session = object->sculpt;
if (BKE_pbvh_type(sculpt_session->pbvh) == PBVH_GRIDS && sculpt_session->multires) {
- Mesh *mesh = ob->data;
+ Mesh *mesh = object->data;
multiresModifier_reshapeFromCCG(
sculpt_session->multires->totlvl, mesh, sculpt_session->subdiv_ccg);
}
}
}
-void multires_force_sculpt_rebuild(Object *ob)
+void multires_force_sculpt_rebuild(Object *object)
{
- multires_flush_sculpt_updates(ob);
+ multires_flush_sculpt_updates(object);
- if (ob && ob->sculpt) {
- SculptSession *ss = ob->sculpt;
+ if (object && object->sculpt) {
+ SculptSession *ss = object->sculpt;
if (ss->pbvh) {
BKE_pbvh_free(ss->pbvh);
- ob->sculpt->pbvh = NULL;
+ object->sculpt->pbvh = NULL;
}
if (ss->pmap) {
@@ -441,12 +441,12 @@ void multires_force_sculpt_rebuild(Object *ob)
}
}
-void multires_force_external_reload(Object *ob)
+void multires_force_external_reload(Object *object)
{
- Mesh *me = BKE_mesh_from_object(ob);
+ Mesh *mesh = BKE_mesh_from_object(object);
- CustomData_external_reload(&me->ldata, &me->id, CD_MASK_MDISPS, me->totloop);
- multires_force_sculpt_rebuild(ob);
+ CustomData_external_reload(&mesh->ldata, &mesh->id, CD_MASK_MDISPS, mesh->totloop);
+ multires_force_sculpt_rebuild(object);
}
/* reset the multires levels to match the number of mdisps */