[Bf-blender-cvs] [7502cdd86f1] blenloader-api: improve naming

[Jacques Lucke]

Commit: 7502cdd86f1eb8a829a4bf88275cfbc62e52c9b8
Author: Jacques Lucke
Date:   Sun Mar 8 12:16:33 2020 +0100
Branches: blenloader-api
https://developer.blender.org/rB7502cdd86f1eb8a829a4bf88275cfbc62e52c9b8

improve naming

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

M       source/blender/blenkernel/BKE_curveprofile.h
M       source/blender/blenkernel/intern/curveprofile.c
M       source/blender/blenloader/intern/readfile.c
M       source/blender/blenloader/intern/writefile.c
M       source/blender/modifiers/intern/MOD_bevel.c

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

diff --git a/source/blender/blenkernel/BKE_curveprofile.h 
b/source/blender/blenkernel/BKE_curveprofile.h
index ce291670a01..b8fb783a32f 100644
--- a/source/blender/blenkernel/BKE_curveprofile.h
+++ b/source/blender/blenkernel/BKE_curveprofile.h
@@ -80,8 +80,8 @@ void BKE_curveprofile_evaluate_length_portion(const struct 
CurveProfile *profile
                                               float *x_out,
                                               float *y_out);
 
-void BKE_curveprofile_blo_write_ptr(struct BloWriter *writer, const struct 
CurveProfile *profile);
-void BKE_curveprofile_blo_read_struct(struct BloReader *reader, struct 
CurveProfile *profile);
+void BKE_curveprofile_blo_write(struct BloWriter *writer, const struct 
CurveProfile *profile);
+void BKE_curveprofile_blo_read(struct BloReader *reader, struct CurveProfile 
*profile);
 
 #ifdef __cplusplus
 }
diff --git a/source/blender/blenkernel/intern/curveprofile.c 
b/source/blender/blenkernel/intern/curveprofile.c
index 9bbc4496370..e1b6f93f58c 100644
--- a/source/blender/blenkernel/intern/curveprofile.c
+++ b/source/blender/blenkernel/intern/curveprofile.c
@@ -1073,13 +1073,13 @@ void BKE_curveprofile_evaluate_length_portion(const 
CurveProfile *profile,
   *y_out = interpf(profile->table[i].y, profile->table[i + 1].y, lerp_factor);
 }
 
-void BKE_curveprofile_blo_write_ptr(BloWriter *writer, const CurveProfile 
*profile)
+void BKE_curveprofile_blo_write(BloWriter *writer, const CurveProfile *profile)
 {
   BLO_write_struct(writer, CurveProfile, profile);
   BLO_write_struct_array(writer, CurveProfilePoint, profile->path_len, 
profile->path);
 }
 
-void BKE_curveprofile_blo_read_struct(BloReader *reader, CurveProfile *profile)
+void BKE_curveprofile_blo_read(BloReader *reader, CurveProfile *profile)
 {
   BLO_read_data_address(reader, profile->path);
   profile->table = NULL;
diff --git a/source/blender/blenloader/intern/readfile.c 
b/source/blender/blenloader/intern/readfile.c
index 980bf01f1cb..b1ce5115c3e 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2737,7 +2737,7 @@ static void direct_link_id(FileData *fd, ID *id)
 /* cuma itself has been read! */
 static void direct_link_curvemapping(FileData *fd, CurveMapping *cumap)
 {
-  BKE_curvemapping_blo_read(fd, cumap);
+  BKE_curvemapping_blo_read(wrap_reader(fd), cumap);
 }
 
 /** \} */
@@ -6327,8 +6327,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
     sce->toolsettings->custom_bevel_profile_preset = newdataadr(
         fd, sce->toolsettings->custom_bevel_profile_preset);
     if (sce->toolsettings->custom_bevel_profile_preset) {
-      BKE_curveprofile_blo_read_struct(wrap_reader(fd),
-                                       
sce->toolsettings->custom_bevel_profile_preset);
+      BKE_curveprofile_blo_read(wrap_reader(fd), 
sce->toolsettings->custom_bevel_profile_preset);
     }
   }
 
diff --git a/source/blender/blenloader/intern/writefile.c 
b/source/blender/blenloader/intern/writefile.c
index 4296e226bc9..4b0bfdb98e6 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -2399,7 +2399,7 @@ static void write_scene(WriteData *wd, Scene *sce)
   }
   /* Write the curve profile to the file. */
   if (tos->custom_bevel_profile_preset) {
-    BKE_curveprofile_blo_write_ptr(wrap_writer(wd), 
tos->custom_bevel_profile_preset);
+    BKE_curveprofile_blo_write(wrap_writer(wd), 
tos->custom_bevel_profile_preset);
   }
 
   write_paint(wd, &tos->imapaint.paint);
diff --git a/source/blender/modifiers/intern/MOD_bevel.c 
b/source/blender/modifiers/intern/MOD_bevel.c
index 565db85bf4c..5bf38a673a4 100644
--- a/source/blender/modifiers/intern/MOD_bevel.c
+++ b/source/blender/modifiers/intern/MOD_bevel.c
@@ -269,7 +269,7 @@ static void bloWrite(BloWriter *writer, const ModifierData 
*md)
 {
   BevelModifierData *bmd = (BevelModifierData *)md;
   if (bmd->custom_profile) {
-    BKE_curveprofile_blo_write_ptr(writer, bmd->custom_profile);
+    BKE_curveprofile_blo_write(writer, bmd->custom_profile);
   }
 }
 
@@ -278,7 +278,7 @@ static void bloRead(BloReader *reader, ModifierData *md)
   BevelModifierData *bmd = (BevelModifierData *)md;
   BLO_read_data_address(reader, bmd->custom_profile);
   if (bmd->custom_profile) {
-    BKE_curveprofile_blo_read_struct(reader, bmd->custom_profile);
+    BKE_curveprofile_blo_read(reader, bmd->custom_profile);
   }
 }

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs