Cycles: Prevent crash in special cases when object has less slots than mesh
This is something what was guaranteed in give_current_material(), just copied some range checking logic from there. Not sure what would be a proper fix here tho.
This commit is contained in:
parent
06b51c64ad
commit
4e3578f470
Notes:
blender-bot
2023-02-14 07:35:03 +01:00
Referenced by issue #49435, Crashing file
|
@ -2368,8 +2368,12 @@ Mesh *BKE_mesh_new_from_object(
|
|||
if (tmpcu->mat) {
|
||||
for (i = tmpcu->totcol; i-- > 0; ) {
|
||||
/* are we an object material or data based? */
|
||||
|
||||
tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpcu->mat[i];
|
||||
if (ob->matbits[i] && i >= ob->totcol) {
|
||||
tmpmesh->mat[i] = NULL;
|
||||
}
|
||||
else {
|
||||
tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpcu->mat[i];
|
||||
}
|
||||
|
||||
if (do_mat_id_us && tmpmesh->mat[i]) {
|
||||
id_us_plus(&tmpmesh->mat[i]->id);
|
||||
|
@ -2388,7 +2392,12 @@ Mesh *BKE_mesh_new_from_object(
|
|||
if (tmpmb->mat) {
|
||||
for (i = tmpmb->totcol; i-- > 0; ) {
|
||||
/* are we an object material or data based? */
|
||||
tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpmb->mat[i];
|
||||
if (ob->matbits[i] && i >= ob->totcol) {
|
||||
tmpmesh->mat[i] = NULL;
|
||||
}
|
||||
else {
|
||||
tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : tmpmb->mat[i];
|
||||
}
|
||||
|
||||
if (do_mat_id_us && tmpmesh->mat[i]) {
|
||||
id_us_plus(&tmpmesh->mat[i]->id);
|
||||
|
@ -2408,7 +2417,12 @@ Mesh *BKE_mesh_new_from_object(
|
|||
if (origmesh->mat) {
|
||||
for (i = origmesh->totcol; i-- > 0; ) {
|
||||
/* are we an object material or data based? */
|
||||
tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : origmesh->mat[i];
|
||||
if (ob->matbits[i] && i >= ob->totcol) {
|
||||
tmpmesh->mat[i] = NULL;
|
||||
}
|
||||
else {
|
||||
tmpmesh->mat[i] = ob->matbits[i] ? ob->mat[i] : origmesh->mat[i];
|
||||
}
|
||||
|
||||
if (do_mat_id_us && tmpmesh->mat[i]) {
|
||||
id_us_plus(&tmpmesh->mat[i]->id);
|
||||
|
|
Loading…
Reference in New Issue