[Bf-blender-cvs] [d7858eedbf5] blenloader-api: improve naming
Jacques Lucke
noreply at git.blender.org
Sun Mar 8 12:39:28 CET 2020
Commit: d7858eedbf56606b75d53acd095d83fbb6689bbc
Author: Jacques Lucke
Date: Sun Mar 8 12:06:31 2020 +0100
Branches: blenloader-api
https://developer.blender.org/rBd7858eedbf56606b75d53acd095d83fbb6689bbc
improve naming
===================================================================
M source/blender/blenkernel/BKE_colortools.h
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenloader/intern/writefile.c
M source/blender/modifiers/intern/MOD_hook.c
M source/blender/modifiers/intern/MOD_warp.c
M source/blender/modifiers/intern/MOD_weightvgedit.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_colortools.h b/source/blender/blenkernel/BKE_colortools.h
index 1b374ce232b..b7cbdef6e27 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -53,8 +53,8 @@ void BKE_curvemapping_set_black_white_ex(const float black[3],
void BKE_curvemapping_set_black_white(struct CurveMapping *cumap,
const float black[3],
const float white[3]);
-void BKE_curvemapping_blo_write_ptr(struct BloWriter *writer, struct CurveMapping *cumap);
-void BKE_curvemapping_blo_write_struct(struct BloWriter *writer, struct CurveMapping *cumap);
+void BKE_curvemapping_blo_write(struct BloWriter *writer, struct CurveMapping *cumap);
+void BKE_curvemapping_blo_write_content(struct BloWriter *writer, struct CurveMapping *cumap);
void BKE_curvemapping_blo_read_struct(struct BloReader *reader, struct CurveMapping *cumap);
enum {
diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index 082022946c6..4a4a37aeacd 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -180,13 +180,13 @@ void BKE_curvemapping_set_black_white(CurveMapping *cumap,
cumap->changed_timestamp++;
}
-void BKE_curvemapping_blo_write_ptr(BloWriter *writer, CurveMapping *cumap)
+void BKE_curvemapping_blo_write(BloWriter *writer, CurveMapping *cumap)
{
BLO_write_struct(writer, CurveMapping, cumap);
- BKE_curvemapping_blo_write_struct(writer, cumap);
+ BKE_curvemapping_blo_write_content(writer, cumap);
}
-void BKE_curvemapping_blo_write_struct(BloWriter *writer, CurveMapping *cumap)
+void BKE_curvemapping_blo_write_content(BloWriter *writer, CurveMapping *cumap)
{
for (int i = 0; i < CM_TOT; i++) {
BLO_write_struct_array(writer, CurveMapPoint, cumap->cm[i].totpoint, cumap->cm[i].curve);
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index fa974b7a0da..7ccc3bc58ac 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1046,7 +1046,7 @@ static void write_nodetree_nolib(WriteData *wd, bNodeTree *ntree)
/* could be handlerized at some point, now only 1 exception still */
if ((ntree->type == NTREE_SHADER) &&
ELEM(node->type, SH_NODE_CURVE_VEC, SH_NODE_CURVE_RGB)) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), node->storage);
+ BKE_curvemapping_blo_write(wrap_writer(wd), node->storage);
}
else if (ntree->type == NTREE_SHADER && (node->type == SH_NODE_SCRIPT)) {
NodeShaderScript *nss = (NodeShaderScript *)node->storage;
@@ -1060,11 +1060,11 @@ static void write_nodetree_nolib(WriteData *wd, bNodeTree *ntree)
CMP_NODE_CURVE_VEC,
CMP_NODE_CURVE_RGB,
CMP_NODE_HUECORRECT)) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), node->storage);
+ BKE_curvemapping_blo_write(wrap_writer(wd), node->storage);
}
else if ((ntree->type == NTREE_TEXTURE) &&
(node->type == TEX_NODE_CURVE_RGB || node->type == TEX_NODE_CURVE_TIME)) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), node->storage);
+ BKE_curvemapping_blo_write(wrap_writer(wd), node->storage);
}
else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_MOVIEDISTORTION)) {
/* pass */
@@ -1337,13 +1337,13 @@ static void write_particlesettings(WriteData *wd, ParticleSettings *part)
writestruct(wd, DATA, EffectorWeights, 1, part->effector_weights);
if (part->clumpcurve) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), part->clumpcurve);
+ BKE_curvemapping_blo_write(wrap_writer(wd), part->clumpcurve);
}
if (part->roughcurve) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), part->roughcurve);
+ BKE_curvemapping_blo_write(wrap_writer(wd), part->roughcurve);
}
if (part->twistcurve) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), part->twistcurve);
+ BKE_curvemapping_blo_write(wrap_writer(wd), part->twistcurve);
}
for (ParticleDupliWeight *dw = part->instance_weights.first; dw; dw = dw->next) {
@@ -1656,14 +1656,14 @@ static void write_gpencil_modifiers(WriteData *wd, ListBase *modbase)
ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
if (gpmd->curve_thickness) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), gpmd->curve_thickness);
+ BKE_curvemapping_blo_write(wrap_writer(wd), gpmd->curve_thickness);
}
}
else if (md->type == eGpencilModifierType_Hook) {
HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
if (gpmd->curfalloff) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), gpmd->curfalloff);
+ BKE_curvemapping_blo_write(wrap_writer(wd), gpmd->curfalloff);
}
}
}
@@ -2195,7 +2195,7 @@ static void write_light(WriteData *wd, Light *la)
}
if (la->curfalloff) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), la->curfalloff);
+ BKE_curvemapping_blo_write(wrap_writer(wd), la->curfalloff);
}
/* Node-tree is integral part of lights, no libdata. */
@@ -2246,12 +2246,12 @@ static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
if (smd->type == seqModifierType_Curves) {
CurvesModifierData *cmd = (CurvesModifierData *)smd;
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), &cmd->curve_mapping);
+ BKE_curvemapping_blo_write(wrap_writer(wd), &cmd->curve_mapping);
}
else if (smd->type == seqModifierType_HueCorrect) {
HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), &hcmd->curve_mapping);
+ BKE_curvemapping_blo_write(wrap_writer(wd), &hcmd->curve_mapping);
}
}
else {
@@ -2263,7 +2263,7 @@ static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
static void write_view_settings(WriteData *wd, ColorManagedViewSettings *view_settings)
{
if (view_settings->curve_mapping) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), view_settings->curve_mapping);
+ BKE_curvemapping_blo_write(wrap_writer(wd), view_settings->curve_mapping);
}
}
@@ -2277,7 +2277,7 @@ static void write_view3dshading(WriteData *wd, View3DShading *shading)
static void write_paint(WriteData *wd, Paint *p)
{
if (p->cavity_curve) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), p->cavity_curve);
+ BKE_curvemapping_blo_write(wrap_writer(wd), p->cavity_curve);
}
writestruct(wd, DATA, PaintToolSlot, p->tool_slots_len, p->tool_slots);
}
@@ -2377,15 +2377,15 @@ static void write_scene(WriteData *wd, Scene *sce)
}
/* write grease-pencil custom ipo curve to file */
if (tos->gp_interpolate.custom_ipo) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), tos->gp_interpolate.custom_ipo);
+ BKE_curvemapping_blo_write(wrap_writer(wd), tos->gp_interpolate.custom_ipo);
}
/* write grease-pencil multiframe falloff curve to file */
if (tos->gp_sculpt.cur_falloff) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), tos->gp_sculpt.cur_falloff);
+ BKE_curvemapping_blo_write(wrap_writer(wd), tos->gp_sculpt.cur_falloff);
}
/* write grease-pencil primitive curve to file */
if (tos->gp_sculpt.cur_primitive) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), tos->gp_sculpt.cur_primitive);
+ BKE_curvemapping_blo_write(wrap_writer(wd), tos->gp_sculpt.cur_primitive);
}
/* Write the curve profile to the file. */
if (tos->custom_bevel_profile_preset) {
@@ -2532,7 +2532,7 @@ static void write_scene(WriteData *wd, Scene *sce)
}
write_previews(wd, sce->preview);
- BKE_curvemapping_blo_write_struct(wrap_writer(wd), &sce->r.mblur_shutter_curve);
+ BKE_curvemapping_blo_write_content(wrap_writer(wd), &sce->r.mblur_shutter_curve);
for (ViewLayer *view_layer = sce->view_layers.first; view_layer; view_layer = view_layer->next) {
write_view_layer(wd, view_layer);
@@ -2996,21 +2996,20 @@ static void write_brush(WriteData *wd, Brush *brush)
write_iddata(wd, &brush->id);
if (brush->curve) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), brush->curve);
+ BKE_curvemapping_blo_write(wrap_writer(wd), brush->curve);
}
if (brush->gpencil_settings) {
writestruct(wd, DATA, BrushGpencilSettings, 1, brush->gpencil_settings);
if (brush->gpencil_settings->curve_sensitivity) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd),
- brush->gpencil_settings->curve_sensitivity);
+ BKE_curvemapping_blo_write(wrap_writer(wd), brush->gpencil_settings->curve_sensitivity);
}
if (brush->gpencil_settings->curve_strength) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), brush->gpencil_settings->curve_strength);
+ BKE_curvemapping_blo_write(wrap_writer(wd), brush->gpencil_settings->curve_strength);
}
if (brush->gpencil_settings->curve_jitter) {
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd), brush->gpencil_settings->curve_jitter);
+ BKE_curvemapping_blo_write(wrap_writer(wd), brush->gpencil_settings->curve_jitter);
}
}
if (brush->gradient) {
@@ -3269,36 +3268,33 @@ static void write_linestyle_alpha_modifiers(WriteData *wd, ListBase *modifiers)
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd),
- ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
+ BKE_curvemapping_blo_write(wrap_writer(wd),
+ ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
- BKE_curvemapping_blo_write_ptr(wrap_writer(wd),
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list