Commit: dd158f1caba48810462c33855b1e877aba8d7324
Author: Chris Blackbourn
Date: Thu Jul 21 16:25:01 2022 +1200
Branches: master
https://developer.blender.org/rBdd158f1caba48810462c33855b1e877aba8d7324
Fix failing cycles test from previous commit
Deprecated custom data type CD_MTEXPOLY has inconsistent data usage.
Reviewed By: Campbell Barton
===================================================================
M source/blender/blenkernel/intern/customdata.cc
===================================================================
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;
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
