blender
/
blender
128
396
Fork 569
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Merge branch 'master' into blender2.8

This commit is contained in:
Campbell Barton 2018-12-06 11:27:57 +11:00
parent ffdd5b3699 f6c615a8c2
commit 74db65e542
Notes: blender-bot 2023-04-14 09:18:04 +02:00 
Referenced by issue #59559, Jump to Perspective Viewport
Referenced by issue #59168, Blender 2.8 (9a8b6d51c1) - Crash when going in Edit Mode with Multiresolution modifier
Referenced by issue #59050, Blender 2.8 Motion Tracking, Deleting trackers crashes Blender.
Referenced by issue #59042, Subdivision mangling texture UVs and Vertex Colors in 2.80
Referenced by issue #58984, Traceback error during FBX export
Referenced by issue #58958, Selection Issues on High Res Monitor
Referenced by issue #58925, Blender 2.8 BETA, Unwrapping meshes with ngons give bad results
Referenced by issue #58902, "Texture Paint" Workspace causes Traceback Error Popup
Referenced by issue #58867, [SOLVED] Eevee viewport shading isn't working
Referenced by issue #58832, The Spin tool yields incorrect results during a 360deg operation
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/blender/editors/sculpt_paint/paint_vertex_weight_ops.c
View File

@ -692,13 +692,15 @@ static int paint_weight_gradient_modal(bContext *C, wmOperator *op, const wmEven
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);
DEG_id_tag_update(&ob->id, OB_RECALC_DATA);
WM_event_add_notifier(C, NC_OBJECT | ND_DRAW, ob);