[Bf-blender-cvs] [50cb9b52bb1] blender2.8: Multires: Implement function to get mesh at multires position of stack
Sergey Sharybin
noreply at git.blender.org
Thu Aug 16 14:42:21 CEST 2018
Commit: 50cb9b52bb13d6805c9ffdf39f84d0af7592160b
Author: Sergey Sharybin
Date: Thu Aug 16 13:00:24 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB50cb9b52bb13d6805c9ffdf39f84d0af7592160b
Multires: Implement function to get mesh at multires position of stack
===================================================================
M source/blender/blenkernel/BKE_multires.h
M source/blender/blenkernel/intern/multires.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_multires.h b/source/blender/blenkernel/BKE_multires.h
index 0a547936a39..71997e55b66 100644
--- a/source/blender/blenkernel/BKE_multires.h
+++ b/source/blender/blenkernel/BKE_multires.h
@@ -86,6 +86,9 @@ int multires_get_level(struct Scene *scene, struct Object *ob, const struct Mult
bool render, bool ignore_simplify);
struct DerivedMesh *get_multires_dm(struct Depsgraph *depsgraph, struct Scene *scene, struct MultiresModifierData *mmd,
struct Object *ob);
+struct Mesh *get_multires_mesh(
+ struct Depsgraph *depsgraph, struct Scene *scene,
+ struct MultiresModifierData *mmd, struct Object *ob);
void multiresModifier_del_levels(struct MultiresModifierData *mmd, struct Scene *scene, struct Object *object, int direction);
void multiresModifier_base_apply(struct MultiresModifierData *mmd, struct Scene *scene, struct Object *ob);
void multiresModifier_subdivide(struct MultiresModifierData *mmd, struct Scene *scene, struct Object *ob, int updateblock, int simple);
diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c
index b4fd93afba1..bd6c30606f4 100644
--- a/source/blender/blenkernel/intern/multires.c
+++ b/source/blender/blenkernel/intern/multires.c
@@ -49,6 +49,7 @@
#include "BKE_pbvh.h"
#include "BKE_ccg.h"
#include "BKE_cdderivedmesh.h"
+#include "BKE_library.h"
#include "BKE_mesh.h"
#include "BKE_mesh_mapping.h"
#include "BKE_mesh_runtime.h"
@@ -293,6 +294,30 @@ DerivedMesh *get_multires_dm(struct Depsgraph *depsgraph, Scene *scene, Multires
return dm;
}
+Mesh *get_multires_mesh(
+ struct Depsgraph *depsgraph,
+ Scene *scene,
+ MultiresModifierData *mmd,
+ Object *ob)
+{
+ Mesh *deformed_mesh = mesh_get_eval_deform(depsgraph, scene, ob, CD_MASK_BAREMESH);
+ ModifierEvalContext modifier_ctx = {
+ .depsgraph = depsgraph,
+ .object = ob,
+ .flag = MOD_APPLY_USECACHE | MOD_APPLY_IGNORE_SIMPLIFY};
+ Mesh *result = modifier_applyModifier(&mmd->modifier, &modifier_ctx, deformed_mesh);
+ if (result == deformed_mesh) {
+ /* TODO(sergey): De-duplicate with copy in modifier stack. */
+ BKE_id_copy_ex(NULL, &deformed_mesh->id, (ID **)&result,
+ (LIB_ID_CREATE_NO_MAIN |
+ LIB_ID_CREATE_NO_USER_REFCOUNT |
+ LIB_ID_CREATE_NO_DEG_TAG |
+ LIB_ID_COPY_CD_REFERENCE),
+ false);
+ }
+ return result;
+}
+
MultiresModifierData *find_multires_modifier_before(Scene *scene, ModifierData *lastmd)
{
ModifierData *md;
More information about the Bf-blender-cvs
mailing list