Commit: 5ce987f254f447e9d84763ed04cef33701a8a8dc
Author: Amelie Fondevilla
Date: Mon Dec 5 14:23:04 2022 +0100
Branches: gpencil-new-data-proposal
https://developer.blender.org/rB5ce987f254f447e9d84763ed04cef33701a8a8dc
new to old conversion initialisation : test and empty function
===================================================================
M source/blender/blenkernel/intern/gpencil_new_proposal.hh
M source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
M source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
===================================================================
diff --git a/source/blender/blenkernel/intern/gpencil_new_proposal.hh
b/source/blender/blenkernel/intern/gpencil_new_proposal.hh
index 27d1f671327..e3a847e882a 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal.hh
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal.hh
@@ -350,7 +350,7 @@ class GPData : public ::GPData {
};
GPData convert_old_to_new_gpencil_data(bGPdata *old_gpd);
-bGPdata *convert_new_to_old_gpencil_data(/*const GreasePencil &new_gpd*/);
+bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd);
} // namespace blender::bke
diff --git
a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
index 2712d587fd7..17295b3c469 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
@@ -34,11 +34,11 @@ GPData convert_old_to_new_gpencil_data(bGPdata *old_gpd)
return new_gpd;
}
-bGPdata *convert_new_to_old_gpencil_data(/*const GreasePencil &new_gpd*/)
+bGPdata *convert_new_to_old_gpencil_data(const GPData &new_gpd)
{
- bGPdata *old_gpd = reinterpret_cast<bGPdata *>(MEM_mallocN(sizeof(bGPdata),
__func__));
+ bGPdata *gpd = reinterpret_cast<bGPdata *>(MEM_mallocN(sizeof(bGPdata),
__func__));
- return old_gpd;
+ return gpd;
}
} // namespace blender::bke
\ No newline at end of file
diff --git a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
index aad705e089b..7c910565ba1 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
@@ -477,4 +477,17 @@ TEST(gpencil_proposal, Old2NewConversion)
free_old_gpencil_data(old_data);
}
+TEST(gpencil_proposal, New2OldConversion)
+{
+ int layers_num = 2, frames_num = 3, strokes_num = 2, points_num = 2;
+
+ GPData data = build_gpencil_data(layers_num, frames_num, strokes_num,
points_num);
+
+ bGPdata *old_data = convert_new_to_old_gpencil_data(data);
+
+ compare_data_structures(data, old_data);
+
+ free_old_gpencil_data(old_data);
+}
+
} // namespace blender::bke::gpencil::tests
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
