[Bf-blender-cvs] [4c87f4f58d5] gpencil-new-data-proposal: setting up conversion functions and test, doing nothing for now

Amelie Fondevilla noreply at git.blender.org
Tue Nov 29 10:27:43 CET 2022


Commit: 4c87f4f58d5803df94f05b41a52a0db7c61f8e2b
Author: Amelie Fondevilla
Date:   Thu Nov 24 10:22:10 2022 +0100
Branches: gpencil-new-data-proposal
https://developer.blender.org/rB4c87f4f58d5803df94f05b41a52a0db7c61f8e2b

setting up conversion functions and test, doing nothing for now

===================================================================

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 94935c8afef..64f6360e9aa 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal.hh
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal.hh
@@ -349,6 +349,9 @@ class GPData : public ::GPData {
   void update_frames_array();
 };
 
+GreasePencil convert_old_to_new_gpencil_data(const bGPdata *old_gpd);
+bGPdata *convert_new_to_old_gpencil_data(const GreasePencil &new_gpd);
+
 }  // namespace blender::bke
 
 #ifdef __cplusplus
diff --git a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
index 234b5170e38..ae9fa96a19a 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
@@ -4,8 +4,23 @@
  * \ingroup bke
  */
 
+#include "DNA_gpencil_types.h"
 #include "gpencil_new_proposal.hh"
 
 namespace blender::bke {
 
-} // namespace blender::bke
\ No newline at end of file
+GreasePencil convert_old_to_new_gpencil_data(const bGPdata *old_gpd)
+{
+  GreasePencil new_gpd;
+
+  return new_gpd;
+}
+
+bGPdata *convert_new_to_old_gpencil_data(const GreasePencil &new_gpd)
+{
+  bGPdata *old_gpd = reinterpret_cast<bGPdata *>(MEM_mallocN(sizeof(bGPdata), __func__));
+
+  return old_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 026f3cf1f9e..630a297469a 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
@@ -420,4 +420,15 @@ TEST(gpencil_proposal, TimeMultiFrameTransformStrokes)
   free_old_gpencil_data(old_data);
 }
 
+TEST(gpencil_proposal, Old2NewConversion)
+{
+  int layers_num = 10, frames_num = 20, strokes_num = 10, points_num = 100;
+
+  bGPdata *old_data = build_old_gpencil_data(layers_num, frames_num, strokes_num, points_num);
+
+  GreasePencil data = convert_old_to_new_gpencil_data(old_data);
+
+  free_old_gpencil_data(old_data);
+}
+
 }  // namespace blender::bke::gpencil::tests



More information about the Bf-blender-cvs mailing list