[Bf-blender-cvs] [69c9204026c] master: Refactor: use new api for write_curvemapping and its users
Jacques Lucke
noreply at git.blender.org
Fri Jun 5 20:55:51 CEST 2020
Commit: 69c9204026c2e39dd7273238b8b8e453e0d8946a
Author: Jacques Lucke
Date: Fri Jun 5 20:55:42 2020 +0200
Branches: master
https://developer.blender.org/rB69c9204026c2e39dd7273238b8b8e453e0d8946a
Refactor: use new api for write_curvemapping and its users
===================================================================
M source/blender/blenloader/intern/writefile.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index bd06ae9ef29..0e0098cf6e3 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -995,18 +995,18 @@ static void write_animdata(BlendWriter *writer, AnimData *adt)
write_nladata(writer, &adt->nla_tracks);
}
-static void write_curvemapping_curves(WriteData *wd, CurveMapping *cumap)
+static void write_curvemapping_curves(BlendWriter *writer, CurveMapping *cumap)
{
for (int a = 0; a < CM_TOT; a++) {
- writestruct(wd, DATA, CurveMapPoint, cumap->cm[a].totpoint, cumap->cm[a].curve);
+ BLO_write_struct_array(writer, CurveMapPoint, cumap->cm[a].totpoint, cumap->cm[a].curve);
}
}
-static void write_curvemapping(WriteData *wd, CurveMapping *cumap)
+static void write_curvemapping(BlendWriter *writer, CurveMapping *cumap)
{
- writestruct(wd, DATA, CurveMapping, 1, cumap);
+ BLO_write_struct(writer, CurveMapping, cumap);
- write_curvemapping_curves(wd, cumap);
+ write_curvemapping_curves(writer, cumap);
}
static void write_CurveProfile(WriteData *wd, CurveProfile *profile)
@@ -1115,7 +1115,7 @@ static void write_nodetree_nolib(BlendWriter *writer, 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)) {
- write_curvemapping(writer->wd, node->storage);
+ write_curvemapping(writer, node->storage);
}
else if (ntree->type == NTREE_SHADER && (node->type == SH_NODE_SCRIPT)) {
NodeShaderScript *nss = (NodeShaderScript *)node->storage;
@@ -1129,11 +1129,11 @@ static void write_nodetree_nolib(BlendWriter *writer, bNodeTree *ntree)
CMP_NODE_CURVE_VEC,
CMP_NODE_CURVE_RGB,
CMP_NODE_HUECORRECT)) {
- write_curvemapping(writer->wd, node->storage);
+ write_curvemapping(writer, node->storage);
}
else if ((ntree->type == NTREE_TEXTURE) &&
(node->type == TEX_NODE_CURVE_RGB || node->type == TEX_NODE_CURVE_TIME)) {
- write_curvemapping(writer->wd, node->storage);
+ write_curvemapping(writer, node->storage);
}
else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_MOVIEDISTORTION)) {
/* pass */
@@ -1463,13 +1463,13 @@ static void write_particlesettings(BlendWriter *writer,
BLO_write_struct(writer, EffectorWeights, part->effector_weights);
if (part->clumpcurve) {
- write_curvemapping(writer->wd, part->clumpcurve);
+ write_curvemapping(writer, part->clumpcurve);
}
if (part->roughcurve) {
- write_curvemapping(writer->wd, part->roughcurve);
+ write_curvemapping(writer, part->roughcurve);
}
if (part->twistcurve) {
- write_curvemapping(writer->wd, part->twistcurve);
+ write_curvemapping(writer, part->twistcurve);
}
LISTBASE_FOREACH (ParticleDupliWeight *, dw, &part->instance_weights) {
@@ -1710,7 +1710,7 @@ static void write_modifiers(BlendWriter *writer, ListBase *modbase)
HookModifierData *hmd = (HookModifierData *)md;
if (hmd->curfalloff) {
- write_curvemapping(writer->wd, hmd->curfalloff);
+ write_curvemapping(writer, hmd->curfalloff);
}
BLO_write_int32_array(writer, hmd->totindex, hmd->indexar);
@@ -1811,14 +1811,14 @@ static void write_modifiers(BlendWriter *writer, ListBase *modbase)
else if (md->type == eModifierType_Warp) {
WarpModifierData *tmd = (WarpModifierData *)md;
if (tmd->curfalloff) {
- write_curvemapping(writer->wd, tmd->curfalloff);
+ write_curvemapping(writer, tmd->curfalloff);
}
}
else if (md->type == eModifierType_WeightVGEdit) {
WeightVGEditModifierData *wmd = (WeightVGEditModifierData *)md;
if (wmd->cmap_curve) {
- write_curvemapping(writer->wd, wmd->cmap_curve);
+ write_curvemapping(writer, wmd->cmap_curve);
}
}
else if (md->type == eModifierType_LaplacianDeform) {
@@ -1889,21 +1889,21 @@ static void write_gpencil_modifiers(BlendWriter *writer, ListBase *modbase)
ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
if (gpmd->curve_thickness) {
- write_curvemapping(writer->wd, gpmd->curve_thickness);
+ write_curvemapping(writer, gpmd->curve_thickness);
}
}
else if (md->type == eGpencilModifierType_Noise) {
NoiseGpencilModifierData *gpmd = (NoiseGpencilModifierData *)md;
if (gpmd->curve_intensity) {
- write_curvemapping(writer->wd, gpmd->curve_intensity);
+ write_curvemapping(writer, gpmd->curve_intensity);
}
}
else if (md->type == eGpencilModifierType_Hook) {
HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
if (gpmd->curfalloff) {
- write_curvemapping(writer->wd, gpmd->curfalloff);
+ write_curvemapping(writer, gpmd->curfalloff);
}
}
else if (md->type == eGpencilModifierType_Tint) {
@@ -1912,25 +1912,25 @@ static void write_gpencil_modifiers(BlendWriter *writer, ListBase *modbase)
BLO_write_struct(writer, ColorBand, gpmd->colorband);
}
if (gpmd->curve_intensity) {
- write_curvemapping(writer->wd, gpmd->curve_intensity);
+ write_curvemapping(writer, gpmd->curve_intensity);
}
}
else if (md->type == eGpencilModifierType_Smooth) {
SmoothGpencilModifierData *gpmd = (SmoothGpencilModifierData *)md;
if (gpmd->curve_intensity) {
- write_curvemapping(writer->wd, gpmd->curve_intensity);
+ write_curvemapping(writer, gpmd->curve_intensity);
}
}
else if (md->type == eGpencilModifierType_Color) {
ColorGpencilModifierData *gpmd = (ColorGpencilModifierData *)md;
if (gpmd->curve_intensity) {
- write_curvemapping(writer->wd, gpmd->curve_intensity);
+ write_curvemapping(writer, gpmd->curve_intensity);
}
}
else if (md->type == eGpencilModifierType_Opacity) {
OpacityGpencilModifierData *gpmd = (OpacityGpencilModifierData *)md;
if (gpmd->curve_intensity) {
- write_curvemapping(writer->wd, gpmd->curve_intensity);
+ write_curvemapping(writer, gpmd->curve_intensity);
}
}
}
@@ -2485,7 +2485,7 @@ static void write_light(BlendWriter *writer, Light *la, const void *id_address)
}
if (la->curfalloff) {
- write_curvemapping(writer->wd, la->curfalloff);
+ write_curvemapping(writer, la->curfalloff);
}
/* Node-tree is integral part of lights, no libdata. */
@@ -2529,7 +2529,7 @@ static void write_collection(BlendWriter *writer, Collection *collection, const
}
}
-static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
+static void write_sequence_modifiers(BlendWriter *writer, ListBase *modbase)
{
SequenceModifierData *smd;
@@ -2537,29 +2537,29 @@ static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
if (smti) {
- writestruct_id(wd, DATA, smti->struct_name, 1, smd);
+ BLO_write_struct_by_name(writer, smti->struct_name, smd);
if (smd->type == seqModifierType_Curves) {
CurvesModifierData *cmd = (CurvesModifierData *)smd;
- write_curvemapping(wd, &cmd->curve_mapping);
+ write_curvemapping(writer, &cmd->curve_mapping);
}
else if (smd->type == seqModifierType_HueCorrect) {
HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
- write_curvemapping(wd, &hcmd->curve_mapping);
+ write_curvemapping(writer, &hcmd->curve_mapping);
}
}
else {
- writestruct(wd, DATA, SequenceModifierData, 1, smd);
+ BLO_write_struct(writer, SequenceModifierData, smd);
}
}
}
-static void write_view_settings(WriteData *wd, ColorManagedViewSettings *view_settings)
+static void write_view_settings(BlendWriter *writer, ColorManagedViewSettings *view_settings)
{
if (view_settings->curve_mapping) {
- write_curvemapping(wd, view_settings->curve_mapping);
+ write_curvemapping(writer, view_settings->curve_mapping);
}
}
@@ -2570,12 +2570,12 @@ static void write_view3dshading(BlendWriter *writer, View3DShading *shading)
}
}
-static void write_paint(WriteData *wd, Paint *p)
+static void write_paint(BlendWriter *writer, Paint *p)
{
if (p->cavity_curve) {
- write_curvemapping(wd, p->cavity_curve);
+ write_curvemapping(writer, p->cavity_curve);
}
- writestruct(wd, DATA, PaintToolSlot, p->tool_slots_len, p->tool_slots);
+ BLO_write_struct_array(writer, PaintToolSlot, p->tool_slots_len, p->tool_slots);
}
static void write_layer_collections(WriteData *wd, ListBase *lb)
@@ -2658,54 +2658,54 @@ static void write_scene(BlendWriter *writer, Scene *sce, const void *id_address)
BLO_write_struct(writer, ToolSettings, tos);
if (tos->vpaint) {
BLO_write_struct(writer, VPaint, tos->vpaint);
- write_paint(writer->wd, &tos->vpaint->paint);
+ write_paint(writer, &tos->vpaint->paint);
}
if (tos->wpaint) {
BLO_write_struct(writer, VPaint, tos->wpaint);
- write_paint(writer->wd, &tos->wpaint->paint);
+ write_paint(writer, &tos->wpaint->paint);
}
if (tos->sculpt) {
BLO_write_struct(writer, Sculpt, tos->sculpt);
- write_paint(writer->wd, &tos->sculpt->paint);
+ write_paint(writer, &tos->sculpt->paint);
}
if (tos->uvsculpt) {
BLO_write_struct(writer, UvSculpt, tos->uvsculpt);
- write_paint(writer->wd, &tos->uvsculpt->paint);
+ write_paint(writer, &tos->uvsculpt->paint);
}
if (tos->gp_paint) {
BLO_write_struct(writer, GpPaint, tos->gp_paint);
- write_paint(writer->wd, &tos->gp_paint->paint);
+ write_paint(writer, &tos->gp_paint->paint);
}
if (tos->gp_vertexpaint) {
BLO_write_struct(writer, GpVertexPaint, tos->gp_vertexpaint);
- writ
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list