[Bf-blender-cvs] [f0b75491e91] blenloader-api: avoid unnecesary changes in writefile
Jacques Lucke
noreply at git.blender.org
Sun Mar 8 12:39:28 CET 2020
Commit: f0b75491e91f28ded8e913c157d7b0537da88db0
Author: Jacques Lucke
Date: Sun Mar 8 12:09:49 2020 +0100
Branches: blenloader-api
https://developer.blender.org/rBf0b75491e91f28ded8e913c157d7b0537da88db0
avoid unnecesary changes in writefile
===================================================================
M source/blender/blenloader/intern/writefile.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index 7ccc3bc58ac..4296e226bc9 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -956,6 +956,16 @@ static void write_animdata(WriteData *wd, AnimData *adt)
write_nladata(wd, &adt->nla_tracks);
}
+static void write_curvemapping_curves(WriteData *wd, CurveMapping *cumap)
+{
+ BKE_curvemapping_blo_write_content(wrap_writer(wd), cumap);
+}
+
+static void write_curvemapping(WriteData *wd, CurveMapping *cumap)
+{
+ BKE_curvemapping_blo_write(wrap_writer(wd), cumap);
+}
+
static void write_node_socket_default_value(WriteData *wd, bNodeSocket *sock)
{
if (sock->default_value == NULL) {
@@ -1046,7 +1056,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(wrap_writer(wd), node->storage);
+ write_curvemapping(wd, node->storage);
}
else if (ntree->type == NTREE_SHADER && (node->type == SH_NODE_SCRIPT)) {
NodeShaderScript *nss = (NodeShaderScript *)node->storage;
@@ -1060,11 +1070,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(wrap_writer(wd), node->storage);
+ write_curvemapping(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(wrap_writer(wd), node->storage);
+ write_curvemapping(wd, node->storage);
}
else if ((ntree->type == NTREE_COMPOSIT) && (node->type == CMP_NODE_MOVIEDISTORTION)) {
/* pass */
@@ -1337,13 +1347,13 @@ static void write_particlesettings(WriteData *wd, ParticleSettings *part)
writestruct(wd, DATA, EffectorWeights, 1, part->effector_weights);
if (part->clumpcurve) {
- BKE_curvemapping_blo_write(wrap_writer(wd), part->clumpcurve);
+ write_curvemapping(wd, part->clumpcurve);
}
if (part->roughcurve) {
- BKE_curvemapping_blo_write(wrap_writer(wd), part->roughcurve);
+ write_curvemapping(wd, part->roughcurve);
}
if (part->twistcurve) {
- BKE_curvemapping_blo_write(wrap_writer(wd), part->twistcurve);
+ write_curvemapping(wd, part->twistcurve);
}
for (ParticleDupliWeight *dw = part->instance_weights.first; dw; dw = dw->next) {
@@ -1656,14 +1666,14 @@ static void write_gpencil_modifiers(WriteData *wd, ListBase *modbase)
ThickGpencilModifierData *gpmd = (ThickGpencilModifierData *)md;
if (gpmd->curve_thickness) {
- BKE_curvemapping_blo_write(wrap_writer(wd), gpmd->curve_thickness);
+ write_curvemapping(wd, gpmd->curve_thickness);
}
}
else if (md->type == eGpencilModifierType_Hook) {
HookGpencilModifierData *gpmd = (HookGpencilModifierData *)md;
if (gpmd->curfalloff) {
- BKE_curvemapping_blo_write(wrap_writer(wd), gpmd->curfalloff);
+ write_curvemapping(wd, gpmd->curfalloff);
}
}
}
@@ -2195,7 +2205,7 @@ static void write_light(WriteData *wd, Light *la)
}
if (la->curfalloff) {
- BKE_curvemapping_blo_write(wrap_writer(wd), la->curfalloff);
+ write_curvemapping(wd, la->curfalloff);
}
/* Node-tree is integral part of lights, no libdata. */
@@ -2246,12 +2256,12 @@ static void write_sequence_modifiers(WriteData *wd, ListBase *modbase)
if (smd->type == seqModifierType_Curves) {
CurvesModifierData *cmd = (CurvesModifierData *)smd;
- BKE_curvemapping_blo_write(wrap_writer(wd), &cmd->curve_mapping);
+ write_curvemapping(wd, &cmd->curve_mapping);
}
else if (smd->type == seqModifierType_HueCorrect) {
HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
- BKE_curvemapping_blo_write(wrap_writer(wd), &hcmd->curve_mapping);
+ write_curvemapping(wd, &hcmd->curve_mapping);
}
}
else {
@@ -2263,7 +2273,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(wrap_writer(wd), view_settings->curve_mapping);
+ write_curvemapping(wd, view_settings->curve_mapping);
}
}
@@ -2277,7 +2287,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(wrap_writer(wd), p->cavity_curve);
+ write_curvemapping(wd, p->cavity_curve);
}
writestruct(wd, DATA, PaintToolSlot, p->tool_slots_len, p->tool_slots);
}
@@ -2377,15 +2387,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(wrap_writer(wd), tos->gp_interpolate.custom_ipo);
+ write_curvemapping(wd, tos->gp_interpolate.custom_ipo);
}
/* write grease-pencil multiframe falloff curve to file */
if (tos->gp_sculpt.cur_falloff) {
- BKE_curvemapping_blo_write(wrap_writer(wd), tos->gp_sculpt.cur_falloff);
+ write_curvemapping(wd, tos->gp_sculpt.cur_falloff);
}
/* write grease-pencil primitive curve to file */
if (tos->gp_sculpt.cur_primitive) {
- BKE_curvemapping_blo_write(wrap_writer(wd), tos->gp_sculpt.cur_primitive);
+ write_curvemapping(wd, tos->gp_sculpt.cur_primitive);
}
/* Write the curve profile to the file. */
if (tos->custom_bevel_profile_preset) {
@@ -2532,7 +2542,7 @@ static void write_scene(WriteData *wd, Scene *sce)
}
write_previews(wd, sce->preview);
- BKE_curvemapping_blo_write_content(wrap_writer(wd), &sce->r.mblur_shutter_curve);
+ write_curvemapping_curves(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,20 +3006,20 @@ static void write_brush(WriteData *wd, Brush *brush)
write_iddata(wd, &brush->id);
if (brush->curve) {
- BKE_curvemapping_blo_write(wrap_writer(wd), brush->curve);
+ write_curvemapping(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(wrap_writer(wd), brush->gpencil_settings->curve_sensitivity);
+ write_curvemapping(wd, brush->gpencil_settings->curve_sensitivity);
}
if (brush->gpencil_settings->curve_strength) {
- BKE_curvemapping_blo_write(wrap_writer(wd), brush->gpencil_settings->curve_strength);
+ write_curvemapping(wd, brush->gpencil_settings->curve_strength);
}
if (brush->gpencil_settings->curve_jitter) {
- BKE_curvemapping_blo_write(wrap_writer(wd), brush->gpencil_settings->curve_jitter);
+ write_curvemapping(wd, brush->gpencil_settings->curve_jitter);
}
}
if (brush->gradient) {
@@ -3268,33 +3278,28 @@ 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(wrap_writer(wd),
- ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_AlongStroke *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_CAMERA:
- BKE_curvemapping_blo_write(wrap_writer(wd),
- ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromCamera *)m)->curve);
break;
case LS_MODIFIER_DISTANCE_FROM_OBJECT:
- BKE_curvemapping_blo_write(wrap_writer(wd),
- ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_DistanceFromObject *)m)->curve);
break;
case LS_MODIFIER_MATERIAL:
- BKE_curvemapping_blo_write(wrap_writer(wd), ((LineStyleAlphaModifier_Material *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_Material *)m)->curve);
break;
case LS_MODIFIER_TANGENT:
- BKE_curvemapping_blo_write(wrap_writer(wd), ((LineStyleAlphaModifier_Tangent *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_Tangent *)m)->curve);
break;
case LS_MODIFIER_NOISE:
- BKE_curvemapping_blo_write(wrap_writer(wd), ((LineStyleAlphaModifier_Noise *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_Noise *)m)->curve);
break;
case LS_MODIFIER_CREASE_ANGLE:
- BKE_curvemapping_blo_write(wrap_writer(wd),
- ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_CreaseAngle *)m)->curve);
break;
case LS_MODIFIER_CURVATURE_3D:
- BKE_curvemapping_blo_write(wrap_writer(wd),
- ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
+ write_curvemapping(wd, ((LineStyleAlphaModifier_Curvature_3D *)m)->curve);
break;
}
}
@@ -3342,32 +3347,25 @@ static void write_linestyle_thickness_modifiers(WriteData *wd, ListBase *modifie
for (m = modifiers->first; m; m = m->next) {
switch (m->type) {
case LS_MODIFIER_ALONG_STROKE:
- BKE_curvemapping_blo_write(wrap_writer(wd),
- ((LineStyleThicknessModifier_Al
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list