diff options
m--------- | release/datafiles/locale | 0 | ||||
m--------- | release/scripts/addons | 0 | ||||
m--------- | release/scripts/addons_contrib | 0 | ||||
-rw-r--r-- | source/blender/render/intern/source/bake_api.c | 23 |
4 files changed, 12 insertions, 11 deletions
diff --git a/release/datafiles/locale b/release/datafiles/locale -Subproject c651e63a9a537624f639950f3127a1dee29205d +Subproject 4e1460519fb76d8fe4b838334d139a3e8d44682 diff --git a/release/scripts/addons b/release/scripts/addons -Subproject 0eef469a5d444f396152376a49d7faad0ba51ab +Subproject cd26c938e597d7493f3d88dfdf69346c0f8b50e diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib -Subproject cf842d8bb7b0033ca4fa99f7ebedcbd3810fd27 +Subproject 34dc9b5a6a5917db65ac589c40fe1b5fed3605d diff --git a/source/blender/render/intern/source/bake_api.c b/source/blender/render/intern/source/bake_api.c index 87cdd8767e0..77f6ab9cfc2 100644 --- a/source/blender/render/intern/source/bake_api.c +++ b/source/blender/render/intern/source/bake_api.c @@ -591,6 +591,18 @@ void RE_bake_pixels_populate( if (me->edit_btmesh) return; + if ((uv_layer == NULL) || (uv_layer[0] == '\0')) { + mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV); + } + else { + int uv_id = CustomData_get_named_layer(&me->ldata, CD_MLOOPUV, uv_layer); + mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id); + } + + if (mloopuv == NULL) + return; + + bd.pixel_array = pixel_array; bd.zspan = MEM_callocN(sizeof(ZSpan) * bake_images->size, "bake zspan"); @@ -603,17 +615,6 @@ void RE_bake_pixels_populate( zbuf_alloc_span(&bd.zspan[i], bake_images->data[i].width, bake_images->data[i].height, R.clipcrop); } - if ((uv_layer == NULL) || (uv_layer[0] == '\0')) { - mloopuv = CustomData_get_layer(&me->ldata, CD_MLOOPUV); - } - else { - int uv_id = CustomData_get_named_layer(&me->ldata, CD_MLOOPUV, uv_layer); - mloopuv = CustomData_get_layer_n(&me->ldata, CD_MTFACE, uv_id); - } - - if (mloopuv == NULL) - return; - looptri = MEM_mallocN(sizeof(*looptri) * tottri, __func__); BKE_mesh_recalc_looptri( |