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

Fix wrong material indicated in the error message when baking

Browse Source 
The material displayed in the error message due to the lack of active
texture was that of the previous slot.
This commit is contained in:
Germano Cavalcante
2020-04-08 09:44:26 -03:00
parent 91d7f5d246
commit 34b28850bf
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/blender/editors/object/object_bake_api.c
View File

@@ -446,7 +446,8 @@ static bool bake_object_check(ViewLayer *view_layer, Object *ob, ReportList *rep
for (i = 0; i < ob->totcol; i++) {
bNodeTree *ntree = NULL;
bNode *node = NULL;
ED_object_get_active_image(ob, i + 1, &image, NULL, &node, &ntree);
const int mat_nr = i + 1;
ED_object_get_active_image(ob, mat_nr, &image, NULL, &node, &ntree);
if (image) {
ImBuf *ibuf;
@@ -481,7 +482,7 @@ static bool bake_object_check(ViewLayer *view_layer, Object *ob, ReportList *rep
}
}
else {
Material *mat = BKE_object_material_get(ob, i);
Material *mat = BKE_object_material_get(ob, mat_nr);
if (mat != NULL) {
BKE_reportf(reports,
RPT_INFO,