griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix #146822: Ensure safe names are used for custom Alembic attributes

Browse Source 
We did not sanitize the names used for UV maps or Color attributes when
exporting to Alembic. Names containing characters like ':' or '/' would
cause an unhandled exception from Alembic.

Pull Request: https://projects.blender.org/blender/blender/pulls/146867
This commit is contained in:
Jesse Yurkovich
2025-09-27 01:23:05 +02:00
committed by Jesse Yurkovich
parent fd3da2004c
commit 4bb6513b7d
3 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/io/alembic/exporter/abc_hierarchy_iterator.cc
View File

@@ -13,6 +13,7 @@
#include "abc_writer_nurbs.h"
#include "abc_writer_points.h"
#include "abc_writer_transform.h"
#include "intern/abc_util.h"
#include <memory>
#include <string>
@@ -83,12 +84,7 @@ void ABCHierarchyIterator::release_writer(AbstractHierarchyWriter *writer)
std::string ABCHierarchyIterator::make_valid_name(const std::string &name) const
{
std::string abc_name(name);
std::replace(abc_name.begin(), abc_name.end(), ' ', '_');
std::replace(abc_name.begin(), abc_name.end(), '.', '_');
std::replace(abc_name.begin(), abc_name.end(), ':', '_');
std::replace(abc_name.begin(), abc_name.end(), '/', '_');
return abc_name;
return get_valid_abc_name(name.c_str());
}
ObjectIdentifier ABCHierarchyIterator::determine_graph_index_object(

13
source/blender/io/alembic/intern/abc_customdata.cc
View File

@@ -8,6 +8,7 @@
#include "abc_customdata.h"
#include "abc_axis_conversion.h"
#include "abc_util.h"
#include <Alembic/Abc/ICompoundProperty.h>
#include <Alembic/Abc/ISampleSelector.h>
@@ -148,7 +149,7 @@ const char *get_uv_sample(UVSample &sample, const CDStreamConfig &config, Custom
static void write_uv(const OCompoundProperty &prop,
CDStreamConfig &config,
const void *data,
const char *name)
const std::string &uv_map_name)
{
std::vector<uint32_t> indices;
std::vector<Imath::V2f> uvs;
@@ -159,11 +160,10 @@ static void write_uv(const OCompoundProperty &prop,
return;
}
std::string uv_map_name(name);
OV2fGeomParam param = config.abc_uv_maps[uv_map_name];
if (!param.valid()) {
param = OV2fGeomParam(prop, name, true, kFacevaryingScope, 1);
param = OV2fGeomParam(prop, uv_map_name, true, kFacevaryingScope, 1);
}
OV2fGeomParam::Sample sample(V2fArraySample(&uvs.front(), uvs.size()),
UInt32ArraySample(&indices.front(), indices.size()),
@@ -213,7 +213,7 @@ static void get_cols(const CDStreamConfig &config,
static void write_mcol(const OCompoundProperty &prop,
CDStreamConfig &config,
const void *data,
const char *name)
const std::string &vcol_name)
{
std::vector<uint32_t> indices;
std::vector<Imath::C4f> buffer;
@@ -224,11 +224,10 @@ static void write_mcol(const OCompoundProperty &prop,
return;
}
std::string vcol_name(name);
OC4fGeomParam param = config.abc_vertex_colors[vcol_name];
if (!param.valid()) {
param = OC4fGeomParam(prop, name, true, kFacevaryingScope, 1);
param = OC4fGeomParam(prop, vcol_name, true, kFacevaryingScope, 1);
}
OC4fGeomParam::Sample sample(C4fArraySample(&buffer.front(), buffer.size()),
@@ -289,7 +288,7 @@ void write_custom_data(const OCompoundProperty &prop,
for (int i = 0; i < tot_layers; i++) {
const void *cd_data = CustomData_get_layer_n(data, cd_data_type, i);
const char *name = CustomData_get_layer_name(data, cd_data_type, i);
std::string name = get_valid_abc_name(CustomData_get_layer_name(data, cd_data_type, i));
if (cd_data_type == CD_PROP_FLOAT2) {
/* Already exported. */

11
source/blender/io/alembic/intern/abc_util.cc
View File

@@ -28,11 +28,12 @@ namespace blender::io::alembic {
std::string get_valid_abc_name(const char *name)
{
std::string name_string(name);
std::replace(name_string.begin(), name_string.end(), ' ', '_');
std::replace(name_string.begin(), name_string.end(), '.', '_');
std::replace(name_string.begin(), name_string.end(), ':', '_');
return name_string;
std::string abc_name(name);
std::replace(abc_name.begin(), abc_name.end(), ' ', '_');
std::replace(abc_name.begin(), abc_name.end(), '.', '_');
std::replace(abc_name.begin(), abc_name.end(), ':', '_');
std::replace(abc_name.begin(), abc_name.end(), '/', '_');
return abc_name;
}
Imath::M44d convert_matrix_datatype(const float mat[4][4])