[Bf-blender-cvs] [bb637f68d81] gpencil-new-data-proposal: commented unused param to remove warning + removed an obsolete comment

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


Commit: bb637f68d81822e88d67edd57de2ffd342fc55c8
Author: Amelie Fondevilla
Date:   Tue Nov 29 10:14:25 2022 +0100
Branches: gpencil-new-data-proposal
https://developer.blender.org/rBbb637f68d81822e88d67edd57de2ffd342fc55c8

commented unused param to remove warning + removed an obsolete comment

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

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 5b2818d5106..27d1f671327 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 GreasePencil &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 c9e3e3b552a..2712d587fd7 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_conversion.cc
@@ -34,7 +34,7 @@ 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 GreasePencil &new_gpd*/)
 {
   bGPdata *old_gpd = reinterpret_cast<bGPdata *>(MEM_mallocN(sizeof(bGPdata), __func__));
 
diff --git a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
index f9ddd7727f1..1ccfd6aaa91 100644
--- a/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
+++ b/source/blender/blenkernel/intern/gpencil_new_proposal_test.cc
@@ -147,8 +147,6 @@ static void compare_data_structures(const GPData &ngpd, const bGPdata *ogpd)
     ++offset;
   }
 
-  // FIXME: this fails because in new data structure
-  // frames are sorted by frame_nb and then layer_index
   for (int i = 0; i < ngpd.frames_size; i++) {
     const ::GPFrame *nfrm = ngpd.frames_array + i;
     int ofrm_layer_index{ogpd_frames[i].first};



More information about the Bf-blender-cvs mailing list