griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix T59799: texture paint mode crash for object with no materials.

Browse Source
This commit is contained in:
Brecht Van Lommel
2018-12-27 12:18:37 +01:00
parent 6de8ff5796
commit 097b9019ce
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/draw/modes/paint_texture_mode.c
View File

@@ -191,12 +191,13 @@ static void PAINT_TEXTURE_cache_init(void *vedata)
Scene *scene = draw_ctx->scene;
const bool use_material_slots = (scene->toolsettings->imapaint.mode == IMAGEPAINT_MODE_MATERIAL);
const Mesh *me = ob->data;
const int mat_nr = max_ii(1, me->totcol);
stl->g_data->shgroup_image_array = MEM_mallocN(
sizeof(*stl->g_data->shgroup_image_array) * (use_material_slots ? me->totcol : 1), __func__);
sizeof(*stl->g_data->shgroup_image_array) * (use_material_slots ? mat_nr : 1), __func__);
if (use_material_slots) {
for (int i = 0; i < me->totcol; i++) {
for (int i = 0; i < mat_nr; i++) {
Material *ma = give_current_material(ob, i + 1);
Image *ima = (ma && ma->texpaintslot) ? ma->texpaintslot[ma->paint_active_slot].ima : NULL;
GPUTexture *tex = ima ?