blender
/
blender
136
404
Fork 586
Code Issues 6.2k Pull Requests 751 Projects 19 Wiki Activity

Fix T84362: Crash when use Vertex Paint in subdivide strokes 

Maniphest Tasks: T84362

Differential Revision: https://developer.blender.org/D9983
This commit is contained in:
Antonio Vazquez 2021-01-04 10:48:52 +01:00
parent c7085be6c6
commit 5e38384034
Notes: blender-bot 2023-02-13 20:00:12 +01:00 
Referenced by issue #84362, Greasepencil  vertex paint mode crash
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/gpencil/gpencil_vertex_paint.c
View File

@ -908,14 +908,14 @@ static bool gpencil_vertexpaint_select_stroke(tGP_BrushVertexpaintData *gso,
/* To each point individually... */
pt = &gps->points[i];
pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt;
index = (pt->runtime.pt_orig) ? pt->runtime.idx_orig : i;
pt_active = pt->runtime.pt_orig;
if (pt_active != NULL) {
/* If masked and the point is not selected, skip it. */
if ((GPENCIL_ANY_VERTEX_MASK(gso->mask)) &&
((pt_active->flag & GP_SPOINT_SELECT) == 0)) {
continue;
}
index = (pt->runtime.pt_orig) ? pt->runtime.idx_orig : i;
hit = true;
gpencil_save_selected_point(gso, gps_active, index, pc1);
saved = true;
@ -931,9 +931,9 @@ static bool gpencil_vertexpaint_select_stroke(tGP_BrushVertexpaintData *gso,
*/
if (i + 1 == gps->totpoints - 1) {
pt = &gps->points[i + 1];
pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt;
index = (pt->runtime.pt_orig) ? pt->runtime.idx_orig : i + 1;
pt_active = pt->runtime.pt_orig;
if (pt_active != NULL) {
index = (pt->runtime.pt_orig) ? pt->runtime.idx_orig : i + 1;
hit = true;
gpencil_save_selected_point(gso, gps_active, index, pc2);
include_last = false;
@ -951,9 +951,9 @@ static bool gpencil_vertexpaint_select_stroke(tGP_BrushVertexpaintData *gso,
* (but wasn't added then, to avoid double-ups).
*/
pt = &gps->points[i];
pt_active = (pt->runtime.pt_orig) ? pt->runtime.pt_orig : pt;
index = (pt->runtime.pt_orig) ? pt->runtime.idx_orig : i;
pt_active = pt->runtime.pt_orig;
if (pt_active != NULL) {
index = (pt->runtime.pt_orig) ? pt->runtime.idx_orig : i;
hit = true;
gpencil_save_selected_point(gso, gps_active, index, pc1);
include_last = false;