Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Multires: Cleanup, naming

Browse Source
This commit is contained in:
Sergey Sharybin
2020-02-28 12:05:48 +01:00
parent d9c25f0192
commit feead324fd
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/blenkernel/BKE_multires.h
View File

@@ -53,9 +53,9 @@ void multires_mark_as_modified(struct Depsgraph *depsgraph,
struct Object *object,
enum MultiresModifiedFlags flags);
void multires_flush_sculpt_updates(struct Object *ob);
void multires_force_sculpt_rebuild(struct Object *ob);
void multires_force_external_reload(struct Object *ob);
void multires_flush_sculpt_updates(struct Object *object);
void multires_force_sculpt_rebuild(struct Object *object);
void multires_force_external_reload(struct Object *object);
/* internal, only called in subsurf_ccg.c */
void multires_modifier_update_mdisps(struct DerivedMesh *dm, struct Scene *scene);

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

@@ -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 */