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

Fix: Increase maximum collection name length for Collection Export

Browse Source 
Follow up to fdaaea6328

The initial collection export code used the wrong define.

Pull Request: https://projects.blender.org/blender/blender/pulls/141239
This commit is contained in:
Jesse Yurkovich
2025-07-01 20:14:35 +02:00
committed by Jesse Yurkovich
parent b6e58c54bb
commit 2683c876f0
10 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/io/io_alembic.cc
View File

@@ -364,7 +364,7 @@ void WM_OT_alembic_export(wmOperatorType *ot)
"Flatten Hierarchy",
"Do not preserve objects' parent/children relationship");
prop = RNA_def_string(ot->srna, "collection", nullptr, MAX_IDPROP_NAME, "Collection", nullptr);
prop = RNA_def_string(ot->srna, "collection", nullptr, MAX_ID_NAME - 2, "Collection", nullptr);
RNA_def_property_flag(prop, PROP_HIDDEN);
RNA_def_boolean(ot->srna, "uvs", true, "UV Coordinates", "Export UV coordinates");

2
source/blender/editors/io/io_obj.cc
View File

@@ -408,7 +408,7 @@ void WM_OT_obj_export(wmOperatorType *ot)
prop = RNA_def_string(ot->srna, "filter_glob", "*.obj;*.mtl", 0, "Extension Filter", "");
RNA_def_property_flag(prop, PROP_HIDDEN);
prop = RNA_def_string(ot->srna, "collection", nullptr, MAX_IDPROP_NAME, "Collection", nullptr);
prop = RNA_def_string(ot->srna, "collection", nullptr, MAX_ID_NAME - 2, "Collection", nullptr);
RNA_def_property_flag(prop, PROP_HIDDEN);
}

2
source/blender/editors/io/io_ply_ops.cc
View File

@@ -206,7 +206,7 @@ void WM_OT_ply_export(wmOperatorType *ot)
prop = RNA_def_string(ot->srna,
"collection",
nullptr,
MAX_IDPROP_NAME,
MAX_ID_NAME - 2,
"Source Collection",
"Export only objects from this collection (and its children)");
RNA_def_property_flag(prop, PROP_HIDDEN);

2
source/blender/editors/io/io_stl_ops.cc
View File

@@ -170,7 +170,7 @@ void WM_OT_stl_export(wmOperatorType *ot)
prop = RNA_def_string(ot->srna,
"collection",
nullptr,
MAX_IDPROP_NAME,
MAX_ID_NAME - 2,
"Source Collection",
"Export only objects from this collection (and its children)");
RNA_def_property_flag(prop, PROP_HIDDEN);

2
source/blender/editors/io/io_usd.cc
View File

@@ -647,7 +647,7 @@ void WM_OT_usd_export(wmOperatorType *ot)
"Only export visible objects. Invisible parents of exported objects are "
"exported as empty transforms");
prop = RNA_def_string(ot->srna, "collection", nullptr, MAX_IDPROP_NAME, "Collection", nullptr);
prop = RNA_def_string(ot->srna, "collection", nullptr, MAX_ID_NAME - 2, "Collection", nullptr);
RNA_def_property_flag(prop, PROP_HIDDEN);
RNA_def_boolean(

2
source/blender/io/alembic/ABC_alembic.h
View File

@@ -60,7 +60,7 @@ struct AlembicExportParams {
float global_scale;
char collection[MAX_IDPROP_NAME] = "";
char collection[MAX_ID_NAME - 2] = "";
};
struct AlembicImportParams {

2
source/blender/io/ply/IO_ply.hh
View File

@@ -49,7 +49,7 @@ struct PLYExportParams {
ePLYVertexColorMode vertex_colors = ePLYVertexColorMode::sRGB;
bool export_attributes = true;
bool export_triangulated_mesh = false;
char collection[MAX_IDPROP_NAME] = "";
char collection[MAX_ID_NAME - 2] = "";
ReportList *reports = nullptr;
};

2
source/blender/io/stl/IO_stl.hh
View File

@@ -42,7 +42,7 @@ struct STLExportParams {
bool apply_modifiers = true;
bool ascii_format = false;
bool use_batch = false;
char collection[MAX_IDPROP_NAME] = "";
char collection[MAX_ID_NAME - 2] = "";
ReportList *reports = nullptr;
};

2
source/blender/io/usd/usd.hh
View File

@@ -177,7 +177,7 @@ struct USDExportParams {
int usdz_downscale_custom_size = 128;
char root_prim_path[1024] = ""; /* FILE_MAX */
char collection[MAX_IDPROP_NAME] = "";
char collection[MAX_ID_NAME - 2] = "";
char custom_properties_namespace[MAX_IDPROP_NAME] = "";
eUSDSceneUnits convert_scene_units = eUSDSceneUnits::USD_SCENE_UNITS_METERS;

2
source/blender/io/wavefront_obj/IO_wavefront_obj.hh
View File

@@ -27,7 +27,7 @@ struct OBJExportParams {
char filepath[FILE_MAX] = "";
/** Pretend that destination file folder is this, if non-empty. Used only for tests. */
char file_base_for_tests[FILE_MAX] = "";
char collection[MAX_IDPROP_NAME] = "";
char collection[MAX_ID_NAME - 2] = "";
/** Full path to current blender file (used for comments in output). */
const char *blen_filepath = nullptr;