Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Blackbourn <chrisbblend@gmail.com>2022-07-21 07:25:01 +0300
committerChris Blackbourn <chrisbblend@gmail.com>2022-07-21 07:28:56 +0300
commitdd158f1caba48810462c33855b1e877aba8d7324 (patch)
tree4561655d14c308daae9ea3d253b9fb994f203a52 /source/blender/blenkernel/intern/customdata.cc
parentc171e8b95c0035eb92d2dcec6e9d82e094954d84 (diff)
Fix failing cycles test from previous commit
Deprecated custom data type CD_MTEXPOLY has inconsistent data usage. Reviewed By: Campbell Barton
Diffstat (limited to 'source/blender/blenkernel/intern/customdata.cc')
-rw-r--r--source/blender/blenkernel/intern/customdata.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/customdata.cc b/source/blender/blenkernel/intern/customdata.cc
index b990ccbec80..b12eafa9cef 100644
--- a/source/blender/blenkernel/intern/customdata.cc
+++ b/source/blender/blenkernel/intern/customdata.cc
@@ -4465,9 +4465,13 @@ static bool CustomData_layer_ensure_data_exists(CustomDataLayer *layer, size_t c
return true;
break;
+ case CD_MTEXPOLY:
+ /* TODO: Investigate multiple test failures on cycles, e.g. cycles_shadow_catcher_cpu. */
+ break;
+
default:
/* Log an error so we can collect instances of bad files. */
- CLOG_ERROR(&LOG, "CustomDataLayer->data is NULL for type %d.", layer->type);
+ CLOG_WARN(&LOG, "CustomDataLayer->data is NULL for type %d.", layer->type);
break;
}
return false;