From 7c4fc5b58d2e7982aefbba093cb8f1dc36b64884 Mon Sep 17 00:00:00 2001
From: Jesse Yurkovich <deadpin>
Date: Fri, 3 Dec 2021 17:01:10 +1100
Subject: Fix T93541: Use warning instead of error for exceeding layer limits

Instead of using RPT_ERROR, use RPT_WARNING which will not raise an
exception to Python. This broke some scripts (including FBX import)
which already check for a None return value.

Ref D13458

Reviewed By: campbellbarton
---
 source/blender/editors/mesh/mesh_data.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source/blender/editors/mesh/mesh_data.c')

diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 7391451b694..7ce408b571f 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -267,7 +267,7 @@ int ED_mesh_uv_texture_add(
 
     layernum_dst = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPUV);
     if (layernum_dst >= MAX_MTFACE) {
-      BKE_reportf(reports, RPT_ERROR, "Cannot add more than %i UV maps", MAX_MTFACE);
+      BKE_reportf(reports, RPT_WARNING, "Cannot add more than %i UV maps", MAX_MTFACE);
       return -1;
     }
 
@@ -287,7 +287,7 @@ int ED_mesh_uv_texture_add(
   else {
     layernum_dst = CustomData_number_of_layers(&me->ldata, CD_MLOOPUV);
     if (layernum_dst >= MAX_MTFACE) {
-      BKE_reportf(reports, RPT_ERROR, "Cannot add more than %i UV maps", MAX_MTFACE);
+      BKE_reportf(reports, RPT_WARNING, "Cannot add more than %i UV maps", MAX_MTFACE);
       return -1;
     }
 
@@ -393,7 +393,7 @@ int ED_mesh_color_add(
 
     layernum = CustomData_number_of_layers(&em->bm->ldata, CD_MLOOPCOL);
     if (layernum >= MAX_MCOL) {
-      BKE_reportf(reports, RPT_ERROR, "Cannot add more than %i vertex color layers", MAX_MCOL);
+      BKE_reportf(reports, RPT_WARNING, "Cannot add more than %i vertex color layers", MAX_MCOL);
       return -1;
     }
 
@@ -411,7 +411,7 @@ int ED_mesh_color_add(
   else {
     layernum = CustomData_number_of_layers(&me->ldata, CD_MLOOPCOL);
     if (layernum >= MAX_MCOL) {
-      BKE_reportf(reports, RPT_ERROR, "Cannot add more than %i vertex color layers", MAX_MCOL);
+      BKE_reportf(reports, RPT_WARNING, "Cannot add more than %i vertex color layers", MAX_MCOL);
       return -1;
     }
 
@@ -529,7 +529,7 @@ int ED_mesh_sculpt_color_add(
     layernum = CustomData_number_of_layers(&em->bm->vdata, CD_PROP_COLOR);
     if (layernum >= MAX_MCOL) {
       BKE_reportf(
-          reports, RPT_ERROR, "Cannot add more than %i sculpt vertex color layers", MAX_MCOL);
+          reports, RPT_WARNING, "Cannot add more than %i sculpt vertex color layers", MAX_MCOL);
       return -1;
     }
 
@@ -548,7 +548,7 @@ int ED_mesh_sculpt_color_add(
     layernum = CustomData_number_of_layers(&me->vdata, CD_PROP_COLOR);
     if (layernum >= MAX_MCOL) {
       BKE_reportf(
-          reports, RPT_ERROR, "Cannot add more than %i sculpt vertex color layers", MAX_MCOL);
+          reports, RPT_WARNING, "Cannot add more than %i sculpt vertex color layers", MAX_MCOL);
       return -1;
     }
 
-- 
cgit v1.2.3