archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T41100: draw other object UVs doesn't work when both objects have no image.

Browse Source
This commit is contained in:
Brecht Van Lommel
2014-07-19 14:24:34 +02:00
parent 00cb9e5f1c
commit 1f3c8466a8
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/uvedit/uvedit_draw.c
View File

@@ -403,20 +403,28 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage)
int a; int a;
BLI_bitmap *mat_test_array; BLI_bitmap *mat_test_array;
bool ok = false; bool ok = false;
int totcol = 0;
if (me->mloopuv == NULL) { if (me->mloopuv == NULL) {
return; return;
} }
if (ob->totcol == 0) { if (curimage && ob->totcol == 0) {
return; return;
} }
mat_test_array = BLI_BITMAP_NEW_ALLOCA(ob->totcol); totcol = max_ii(ob->totcol, 1);
mat_test_array = BLI_BITMAP_NEW_ALLOCA(totcol);
for (a = 0; a < ob->totcol; a++) { for (a = 0; a < totcol; a++) {
Image *image; Image *image;
ED_object_get_active_image(ob, a + 1, &image, NULL, NULL);
/* if no materials, assume a default material with no image */
if(ob->totcol)
ED_object_get_active_image(ob, a + 1, &image, NULL, NULL);
else
image = NULL;
if (image == curimage) { if (image == curimage) {
BLI_BITMAP_ENABLE(mat_test_array, a); BLI_BITMAP_ENABLE(mat_test_array, a);
ok = true; ok = true;
@@ -429,7 +437,7 @@ static void draw_uvs_other_mesh_new_shading(Object *ob, const Image *curimage)
for (a = me->totpoly; a != 0; a--, mpoly++) { for (a = me->totpoly; a != 0; a--, mpoly++) {
const int mat_nr = mpoly->mat_nr; const int mat_nr = mpoly->mat_nr;
if ((mat_nr >= ob->totcol) || if ((mat_nr >= totcol) ||
(BLI_BITMAP_TEST(mat_test_array, mat_nr)) == 0) (BLI_BITMAP_TEST(mat_test_array, mat_nr)) == 0)
{ {
continue; continue;