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:
authorCampbell Barton <ideasman42@gmail.com>2018-06-04 16:15:34 +0300
committerCampbell Barton <ideasman42@gmail.com>2018-06-04 16:18:48 +0300
commit52f9023fbffc709346f8adcc0145140ce158221e (patch)
tree68d7251e78ceba5698904d137672a73526412e80 /source/blender/blenkernel/intern/cdderivedmesh.c
parent07f004620397fd818d2684d08ff67422d76a92cf (diff)
Fix weight paint crash
The PBVH was referencing runtime custom data which was freed on refresh.
Diffstat (limited to 'source/blender/blenkernel/intern/cdderivedmesh.c')
-rw-r--r--source/blender/blenkernel/intern/cdderivedmesh.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/cdderivedmesh.c b/source/blender/blenkernel/intern/cdderivedmesh.c
index 773ef90aac8..562563390c4 100644
--- a/source/blender/blenkernel/intern/cdderivedmesh.c
+++ b/source/blender/blenkernel/intern/cdderivedmesh.c
@@ -55,6 +55,8 @@
#include "DNA_object_types.h"
#include "DNA_curve_types.h" /* for Curve */
+#include "DEG_depsgraph_query.h"
+
#include "MEM_guardedalloc.h"
#include <string.h>
@@ -289,7 +291,9 @@ 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) {
- Mesh *me = ob->data;
+ Object *ob_orig = DEG_get_original_object(ob);
+ Mesh *me = ob_orig->data;
+ BLI_assert(!(me->id.tag & LIB_TAG_NO_MAIN));
const int looptris_num = poly_to_tri_count(me->totpoly, me->totloop);
MLoopTri *looptri;
bool deformed;