blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Fix T42393 crash in texture paint sampling in image mode when mesh did 

not have a material
This commit is contained in:
Antonis Ryakiotakis 2014-10-27 10:42:59 +01:00
parent e5c13aebea
commit 9c9b145dab
Notes: blender-bot 2023-05-29 09:17:12 +02:00 
Referenced by issue #42848, sample color crash blender if paint mode is set to Image
Referenced by issue #42393, Blender crash after color picking in Texture Paint Mode
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/editors/sculpt_paint/paint_utils.c
View File

@ -292,6 +292,7 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c
MVert mv[4];
float matrix[4][4], proj[4][4];
GLint view[4];
ImagePaintMode mode = scene->toolsettings->imapaint.mode;
/* compute barycentric coordinates */
@ -320,19 +321,25 @@ static void imapaint_pick_uv(Scene *scene, Object *ob, unsigned int faceindex, c
if (findex == faceindex) {
dm->getTessFace(dm, a, &mf);
ma = dm->mat[mf.mat_nr];
slot = &ma->texpaintslot[ma->paint_active_slot];
dm->getVert(dm, mf.v1, &mv[0]);
dm->getVert(dm, mf.v2, &mv[1]);
dm->getVert(dm, mf.v3, &mv[2]);
if (mf.v4)
dm->getVert(dm, mf.v4, &mv[3]);
if (!(slot && slot->uvname && (tf_base = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, slot->uvname))))
tf_base = CustomData_get_layer(&dm->faceData, CD_MTFACE);
if (mode == IMAGEPAINT_MODE_MATERIAL) {
ma = dm->mat[mf.mat_nr];
slot = &ma->texpaintslot[ma->paint_active_slot];
tf = &tf_base[a];
if (!(slot && slot->uvname && (tf_base = CustomData_get_layer_named(&dm->faceData, CD_MTFACE, slot->uvname))))
tf_base = CustomData_get_layer(&dm->faceData, CD_MTFACE);
tf = &tf_base[a];
}
else {
tf_base = CustomData_get_layer(&dm->faceData, CD_MTFACE);
tf = &tf_base[a];
}
p[0] = xy[0];
p[1] = xy[1];