Commit: 74db65e5424a74d2a9f41785f76232396e4eb664
Author: Campbell Barton
Date: Thu Dec 6 11:27:57 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB74db65e5424a74d2a9f41785f76232396e4eb664
Merge branch 'master' into blender2.8
===================================================================
===================================================================
diff --cc source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
index 464b7b8ad2e,28f5c1304c8..7ed1691992f
--- a/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
@@@ -692,15 -687,17 +692,17 @@@ static int paint_weight_gradient_modal(
if (ret & OPERATOR_CANCELLED) {
Object *ob = CTX_data_active_object(C);
- Mesh *me = ob->data;
- if (vert_cache->wpp.wpaint_prev) {
- BKE_defvert_array_free_elems(me->dvert, me->totvert);
- BKE_defvert_array_copy(me->dvert,
vert_cache->wpp.wpaint_prev, me->totvert);
- wpaint_prev_destroy(&vert_cache->wpp);
+ if (vert_cache != NULL) {
+ Mesh *me = ob->data;
+ if (vert_cache->wpp.wpaint_prev) {
+ BKE_defvert_array_free_elems(me->dvert,
me->totvert);
+ BKE_defvert_array_copy(me->dvert,
vert_cache->wpp.wpaint_prev, me->totvert);
+ wpaint_prev_destroy(&vert_cache->wpp);
+ }
+ MEM_freeN(vert_cache);
}
- MEM_freeN(vert_cache);
- DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
+ DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);
}
else if (ret & OPERATOR_FINISHED) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
