diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-04 16:49:11 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-04 16:49:11 +0300 |
| commit | 3b4c7a8c9b0be2471afb9da46d42078298540f39 (patch) | |
| tree | d8a3e028d1e2f69171019c4a245a512dd21624b3 /source/blender/blenkernel/intern/cdderivedmesh.c | |
| parent | 0e8edbbc01c0514ffb2c4abb8c5652b0d5fdb979 (diff) | |
Weight paint: Use helper function to get original mesh
Makes it one line to get needed mesh, no code duplication. And can easily
update asserts and tighten the nuts.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/cdderivedmesh.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c index 562563390c4..f0ee3b4363c 100644 --- a/source/blender/blenkernel/intern/cdderivedmesh.c +++ b/source/blender/blenkernel/intern/cdderivedmesh.c @@ -46,6 +46,7 @@ #include "BKE_global.h" #include "BKE_mesh.h" #include "BKE_mesh_mapping.h" +#include "BKE_object.h" #include "BKE_paint.h" #include "BKE_editmesh.h" #include "BKE_curve.h" @@ -291,9 +292,7 @@ static PBVH *cdDM_getPBVH(Object *ob, DerivedMesh *dm) * this derivedmesh is just original mesh. it's the multires subsurf dm * that this is actually for, to support a pbvh on a modified mesh */ if (!cddm->pbvh && ob->type == OB_MESH) { - Object *ob_orig = DEG_get_original_object(ob); - Mesh *me = ob_orig->data; - BLI_assert(!(me->id.tag & LIB_TAG_NO_MAIN)); + Mesh *me = BKE_object_get_original_mesh(ob); const int looptris_num = poly_to_tri_count(me->totpoly, me->totloop); MLoopTri *looptri; bool deformed; |