Commit: 4e742352ec2269e241d39be57021986af22e34c5
Author: Jacques Lucke
Date: Sun Mar 8 12:13:44 2020 +0100
Branches: blenloader-api
https://developer.blender.org/rB4e742352ec2269e241d39be57021986af22e34c5
improve naming
===================================================================
M source/blender/blenkernel/BKE_colortools.h
M source/blender/blenkernel/intern/colortools.c
M source/blender/blenloader/intern/readfile.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 b7cbdef6e27..b04e8b01035 100644
--- a/source/blender/blenkernel/BKE_colortools.h
+++ b/source/blender/blenkernel/BKE_colortools.h
@@ -55,7 +55,7 @@ void BKE_curvemapping_set_black_white(struct CurveMapping
*cumap,
const float white[3]);
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);
+void BKE_curvemapping_blo_read(struct BloReader *reader, struct CurveMapping
*cumap);
enum {
CURVEMAP_SLOPE_NEGATIVE = 0,
diff --git a/source/blender/blenkernel/intern/colortools.c
b/source/blender/blenkernel/intern/colortools.c
index 4a4a37aeacd..75f804f4e5c 100644
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -193,7 +193,7 @@ void BKE_curvemapping_blo_write_content(BloWriter *writer,
CurveMapping *cumap)
}
}
-void BKE_curvemapping_blo_read_struct(struct BloReader *reader, struct
CurveMapping *cumap)
+void BKE_curvemapping_blo_read(struct BloReader *reader, struct CurveMapping
*cumap)
{
cumap->flag &= ~CUMA_PREMULLED;
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index ac5989f37ab..980bf01f1cb 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -2730,6 +2730,18 @@ static void direct_link_id(FileData *fd, ID *id)
/** \} */
+/* -------------------------------------------------------------------- */
+/** \name Read CurveMapping
+ * \{ */
+
+/* cuma itself has been read! */
+static void direct_link_curvemapping(FileData *fd, CurveMapping *cumap)
+{
+ BKE_curvemapping_blo_read(fd, cumap);
+}
+
+/** \} */
+
/* -------------------------------------------------------------------- */
/** \name Read ID: Brush
* \{ */
@@ -2770,7 +2782,7 @@ static void direct_link_brush(FileData *fd, Brush *brush)
brush->gradient = newdataadr(fd, brush->gradient);
if (brush->curve) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), brush->curve);
+ direct_link_curvemapping(fd, brush->curve);
}
else {
BKE_brush_curve_preset(brush, CURVE_PRESET_SHARP);
@@ -2786,16 +2798,15 @@ static void direct_link_brush(FileData *fd, Brush
*brush)
brush->gpencil_settings->curve_jitter = newdataadr(fd,
brush->gpencil_settings->curve_jitter);
if (brush->gpencil_settings->curve_sensitivity) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
-
brush->gpencil_settings->curve_sensitivity);
+ direct_link_curvemapping(fd, brush->gpencil_settings->curve_sensitivity);
}
if (brush->gpencil_settings->curve_strength) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
brush->gpencil_settings->curve_strength);
+ direct_link_curvemapping(fd, brush->gpencil_settings->curve_strength);
}
if (brush->gpencil_settings->curve_jitter) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
brush->gpencil_settings->curve_jitter);
+ direct_link_curvemapping(fd, brush->gpencil_settings->curve_jitter);
}
}
@@ -3505,7 +3516,7 @@ static void direct_link_nodetree(FileData *fd, bNodeTree
*ntree)
case CMP_NODE_HUECORRECT:
case TEX_NODE_CURVE_RGB:
case TEX_NODE_CURVE_TIME: {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), node->storage);
+ direct_link_curvemapping(fd, node->storage);
break;
}
case SH_NODE_SCRIPT: {
@@ -3894,7 +3905,7 @@ static void direct_link_light(FileData *fd, Light *la)
la->curfalloff = newdataadr(fd, la->curfalloff);
if (la->curfalloff) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), la->curfalloff);
+ direct_link_curvemapping(fd, la->curfalloff);
}
la->preview = direct_link_preview_image(fd, la->preview);
@@ -4416,15 +4427,15 @@ static void direct_link_particlesettings(FileData *fd,
ParticleSettings *part)
part->clumpcurve = newdataadr(fd, part->clumpcurve);
if (part->clumpcurve) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), part->clumpcurve);
+ direct_link_curvemapping(fd, part->clumpcurve);
}
part->roughcurve = newdataadr(fd, part->roughcurve);
if (part->roughcurve) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), part->roughcurve);
+ direct_link_curvemapping(fd, part->roughcurve);
}
part->twistcurve = newdataadr(fd, part->twistcurve);
if (part->twistcurve) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), part->twistcurve);
+ direct_link_curvemapping(fd, part->twistcurve);
}
part->effector_weights = newdataadr(fd, part->effector_weights);
@@ -5418,7 +5429,7 @@ static void direct_link_gpencil_modifiers(FileData *fd,
ListBase *lb)
hmd->curfalloff = newdataadr(fd, hmd->curfalloff);
if (hmd->curfalloff) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), hmd->curfalloff);
+ direct_link_curvemapping(fd, hmd->curfalloff);
}
}
else if (md->type == eGpencilModifierType_Thick) {
@@ -5426,7 +5437,7 @@ static void direct_link_gpencil_modifiers(FileData *fd,
ListBase *lb)
gpmd->curve_thickness = newdataadr(fd, gpmd->curve_thickness);
if (gpmd->curve_thickness) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
gpmd->curve_thickness);
+ direct_link_curvemapping(fd, gpmd->curve_thickness);
/* initialize the curve. Maybe this could be moved to modififer logic
*/
BKE_curvemapping_initialize(gpmd->curve_thickness);
}
@@ -5665,7 +5676,7 @@ static void direct_link_view_settings(FileData *fd,
ColorManagedViewSettings *vi
view_settings->curve_mapping = newdataadr(fd, view_settings->curve_mapping);
if (view_settings->curve_mapping) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
view_settings->curve_mapping);
+ direct_link_curvemapping(fd, view_settings->curve_mapping);
}
}
@@ -6188,7 +6199,7 @@ static void direct_link_paint(FileData *fd, const Scene
*scene, Paint *p)
p->cavity_curve = newdataadr(fd, p->cavity_curve);
if (p->cavity_curve) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), p->cavity_curve);
+ direct_link_curvemapping(fd, p->cavity_curve);
}
else {
BKE_paint_cavity_curve_preset(p, CURVE_PRESET_LINE);
@@ -6230,12 +6241,12 @@ static void direct_link_sequence_modifiers(FileData
*fd, ListBase *lb)
if (smd->type == seqModifierType_Curves) {
CurvesModifierData *cmd = (CurvesModifierData *)smd;
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), &cmd->curve_mapping);
+ direct_link_curvemapping(fd, &cmd->curve_mapping);
}
else if (smd->type == seqModifierType_HueCorrect) {
HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), &hcmd->curve_mapping);
+ direct_link_curvemapping(fd, &hcmd->curve_mapping);
}
}
}
@@ -6297,21 +6308,19 @@ static void direct_link_scene(FileData *fd, Scene *sce)
sce->toolsettings->gp_interpolate.custom_ipo = newdataadr(
fd, sce->toolsettings->gp_interpolate.custom_ipo);
if (sce->toolsettings->gp_interpolate.custom_ipo) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
-
sce->toolsettings->gp_interpolate.custom_ipo);
+ direct_link_curvemapping(fd,
sce->toolsettings->gp_interpolate.custom_ipo);
}
/* relink grease pencil multiframe falloff curve */
sce->toolsettings->gp_sculpt.cur_falloff = newdataadr(
fd, sce->toolsettings->gp_sculpt.cur_falloff);
if (sce->toolsettings->gp_sculpt.cur_falloff) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
sce->toolsettings->gp_sculpt.cur_falloff);
+ direct_link_curvemapping(fd, sce->toolsettings->gp_sculpt.cur_falloff);
}
/* relink grease pencil primitive curve */
sce->toolsettings->gp_sculpt.cur_primitive = newdataadr(
fd, sce->toolsettings->gp_sculpt.cur_primitive);
if (sce->toolsettings->gp_sculpt.cur_primitive) {
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
-
sce->toolsettings->gp_sculpt.cur_primitive);
+ direct_link_curvemapping(fd, sce->toolsettings->gp_sculpt.cur_primitive);
}
/* Relink toolsettings curve profile */
@@ -6518,7 +6527,7 @@ static void direct_link_scene(FileData *fd, Scene *sce)
sce->preview = direct_link_preview_image(fd, sce->preview);
- BKE_curvemapping_blo_read_struct(wrap_reader(fd),
&sce->r.mblur_shutter_curve);
+ direct_link_curvemapping(fd, &sce->r.mblur_shutter_curve);
#ifdef USE_COLLECTION_COMPAT_28
/* this runs before the very first doversion */
@@ -8317,51 +8326,51 @@ static void
direct_link_linestyle_alpha_modifier(FileData *fd, LineStyleModifier
case LS_MODIFIER_ALONG_STROKE: {
LineStyleAlphaModifier_AlongStroke *m =
(LineStyleAlphaModifier_AlongStroke *)modifier;
m->curve = newdataadr(fd, m->curve);
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), m->curve);
+ direct_link_curvemapping(fd, m->curve);
break;
}
case LS_MODIFIER_DISTANCE_FROM_CAMERA: {
LineStyleAlphaModifier_DistanceFromCamera *m =
(LineStyleAlphaModifier_DistanceFromCamera *)
modifier;
m->curve = newdataadr(fd, m->curve);
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), m->curve);
+ direct_link_curvemapping(fd, m->curve);
break;
}
case LS_MODIFIER_DISTANCE_FROM_OBJECT: {
LineStyleAlphaModifier_DistanceFromObject *m =
(LineStyleAlphaModifier_DistanceFromObject *)
modifier;
m->curve = newdataadr(fd, m->curve);
- BKE_curvemapping_blo_read_struct(wrap_reader(fd), m->curve);
+ direct_link_curvemapping(fd, m->curve);
break;
}
case LS_MODIFIER_MATERIAL: {
LineStyleAlphaModifier_Material *m = (LineStyleAlphaModifier_Material
*)modifier;
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
