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

Cleanup: GPv3 conversion: Remove unused public functions.

Browse Source 
Not sure why, several functions exclusively used internally by the GPv3
conversion code were exposed in its header, made them static now.
This commit is contained in:
Bastien Montagne
2024-04-16 17:50:11 +02:00
parent ddb2519339
commit f465943872
2 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/blender/blenkernel/BKE_grease_pencil_legacy_convert.hh
View File

@@ -21,19 +21,11 @@ struct GreasePencilLineartModifierData;
namespace blender::bke::greasepencil::convert {
void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf,
const ListBase &vertex_group_names,
GreasePencilDrawing &r_drawing);
void legacy_gpencil_to_grease_pencil(Main &bmain, GreasePencil &grease_pencil, bGPdata &gpd);
void legacy_gpencil_object(Main &bmain, Object &object);
/** Main entry point to convert all legacy GPData into GreasePencil data and objects. */
void legacy_main(Main &bmain, BlendFileReadReport &reports);
void thickness_factor_to_modifier(const bGPdata &src_object_data, Object &dst_object);
void layer_adjustments_to_modifiers(Main &bmain, bGPdata &src_object_data, Object &dst_object);
void lineart_wrap_v3(const LineartGpencilModifierData *lmd_legacy,
GreasePencilLineartModifierData *lmd);
void lineart_unwrap_v3(LineartGpencilModifierData *lmd_legacy,

14
source/blender/blenkernel/intern/grease_pencil_convert_legacy.cc
View File

@@ -306,9 +306,9 @@ static blender::float4x2 get_legacy_texture_matrix(bGPDstroke *gps)
return texture_matrix * strokemat4x3;
}
void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf,
const ListBase &vertex_group_names,
GreasePencilDrawing &r_drawing)
static void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf,
const ListBase &vertex_group_names,
GreasePencilDrawing &r_drawing)
{
/* Construct an empty CurvesGeometry in-place. */
new (&r_drawing.geometry) CurvesGeometry();
@@ -553,7 +553,7 @@ void legacy_gpencil_frame_to_grease_pencil_drawing(const bGPDframe &gpf,
stroke_materials.finish();
}
void legacy_gpencil_to_grease_pencil(Main &bmain, GreasePencil &grease_pencil, bGPdata &gpd)
static void legacy_gpencil_to_grease_pencil(Main &bmain, GreasePencil &grease_pencil, bGPdata &gpd)
{
using namespace blender::bke::greasepencil;
@@ -797,7 +797,7 @@ static bNodeTree *add_offset_radius_node_tree(Main &bmain)
return group;
}
void thickness_factor_to_modifier(const bGPdata &src_object_data, Object &dst_object)
static void thickness_factor_to_modifier(const bGPdata &src_object_data, Object &dst_object)
{
if (src_object_data.pixfactor == 1.0f) {
return;
@@ -816,7 +816,9 @@ void thickness_factor_to_modifier(const bGPdata &src_object_data, Object &dst_ob
BKE_modifiers_persistent_uid_init(dst_object, *md);
}
void layer_adjustments_to_modifiers(Main &bmain, bGPdata &src_object_data, Object &dst_object)
static void layer_adjustments_to_modifiers(Main &bmain,
bGPdata &src_object_data,
Object &dst_object)
{
bNodeTree *offset_radius_node_tree = nullptr;