[Bf-blender-cvs] [44c6f14f1b8] greasepencil-object: Merge branch 'master' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Tue Feb 11 22:57:53 CET 2020
Commit: 44c6f14f1b84e09a2d3390d6cfefe00539f46b27
Author: Antonio Vazquez
Date: Tue Feb 11 22:57:11 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB44c6f14f1b84e09a2d3390d6cfefe00539f46b27
Merge branch 'master' into greasepencil-object
Conflicts:
source/blender/blenloader/intern/versioning_280.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_280.c
index 36993d95dc9,dd67a4d72cb..dcf2f1cab7e
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -907,3692 -903,3563 +907,3698 @@@ static void do_version_curvemapping_fla
}
/* Util version to walk over all CurveMappings in the given `bmain` */
-static void do_version_curvemapping_walker(Main *bmain, void (*callback)(CurveMapping *cumap))
+static void do_version_curvemapping_walker(Main* bmain, void (*callback)(CurveMapping* cumap))
{
- LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
- callback(&scene->r.mblur_shutter_curve);
-
- if (scene->view_settings.curve_mapping) {
- callback(scene->view_settings.curve_mapping);
- }
-
- if (scene->ed != NULL) {
- LISTBASE_FOREACH (Sequence *, seq, &scene->ed->seqbase) {
- LISTBASE_FOREACH (SequenceModifierData *, smd, &seq->modifiers) {
- const SequenceModifierTypeInfo *smti = BKE_sequence_modifier_type_info_get(smd->type);
-
- if (smti) {
- if (smd->type == seqModifierType_Curves) {
- CurvesModifierData *cmd = (CurvesModifierData *)smd;
- callback(&cmd->curve_mapping);
- }
- else if (smd->type == seqModifierType_HueCorrect) {
- HueCorrectModifierData *hcmd = (HueCorrectModifierData *)smd;
- callback(&hcmd->curve_mapping);
- }
- }
- }
- }
- }
-
- // toolsettings
- ToolSettings *ts = scene->toolsettings;
- if (ts->vpaint) {
- callback(ts->vpaint->paint.cavity_curve);
- }
- if (ts->wpaint) {
- callback(ts->wpaint->paint.cavity_curve);
- }
- if (ts->sculpt) {
- callback(ts->sculpt->paint.cavity_curve);
- }
- if (ts->uvsculpt) {
- callback(ts->uvsculpt->paint.cavity_curve);
- }
- if (ts->gp_paint) {
- callback(ts->gp_paint->paint.cavity_curve);
- }
- if (ts->gp_interpolate.custom_ipo) {
- callback(ts->gp_interpolate.custom_ipo);
- }
- if (ts->gp_sculpt.cur_falloff) {
- callback(ts->gp_sculpt.cur_falloff);
- }
- if (ts->gp_sculpt.cur_primitive) {
- callback(ts->gp_sculpt.cur_primitive);
- }
- callback(ts->imapaint.paint.cavity_curve);
- }
-
- FOREACH_NODETREE_BEGIN (bmain, node_tree, id) {
- LISTBASE_FOREACH (bNode *, node, &node_tree->nodes) {
- if (ELEM(node->type,
- SH_NODE_CURVE_VEC,
- SH_NODE_CURVE_RGB,
- CMP_NODE_CURVE_VEC,
- CMP_NODE_CURVE_RGB,
- CMP_NODE_TIME,
- CMP_NODE_HUECORRECT,
- TEX_NODE_CURVE_RGB,
- TEX_NODE_CURVE_TIME)) {
- callback((CurveMapping *)node->storage);
- }
- }
- }
- FOREACH_NODETREE_END;
-
- LISTBASE_FOREACH (Light *, light, &bmain->lights) {
- if (light->curfalloff) {
- callback(light->curfalloff);
- }
- }
-
- LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
- if (brush->curve) {
- callback(brush->curve);
- }
- if (brush->gpencil_settings) {
- if (brush->gpencil_settings->curve_sensitivity) {
- callback(brush->gpencil_settings->curve_sensitivity);
- }
- if (brush->gpencil_settings->curve_strength) {
- callback(brush->gpencil_settings->curve_strength);
- }
- if (brush->gpencil_settings->curve_jitter) {
- callback(brush->gpencil_settings->curve_jitter);
- }
- }
- }
-
- LISTBASE_FOREACH (ParticleSettings *, part, &bmain->particles) {
- if (part->clumpcurve) {
- callback(part->clumpcurve);
- }
- if (part->roughcurve) {
- callback(part->roughcurve);
- }
- if (part->twistcurve) {
- callback(part->twistcurve);
- }
- }
+ LISTBASE_FOREACH(Scene*, scene, &bmain->scenes) {
+ callback(&scene->r.mblur_shutter_curve);
+
+ if (scene->view_settings.curve_mapping) {
+ callback(scene->view_settings.curve_mapping);
+ }
+
+ if (scene->ed != NULL) {
+ LISTBASE_FOREACH(Sequence*, seq, &scene->ed->seqbase) {
+ LISTBASE_FOREACH(SequenceModifierData*, smd, &seq->modifiers) {
+ const SequenceModifierTypeInfo* smti = BKE_sequence_modifier_type_info_get(smd->type);
+
+ if (smti) {
+ if (smd->type == seqModifierType_Curves) {
+ CurvesModifierData* cmd = (CurvesModifierData*)smd;
+ callback(&cmd->curve_mapping);
+ }
+ else if (smd->type == seqModifierType_HueCorrect) {
+ HueCorrectModifierData* hcmd = (HueCorrectModifierData*)smd;
+ callback(&hcmd->curve_mapping);
+ }
+ }
+ }
+ }
+ }
+
+ // toolsettings
+ ToolSettings* ts = scene->toolsettings;
+ if (ts->vpaint) {
+ callback(ts->vpaint->paint.cavity_curve);
+ }
+ if (ts->wpaint) {
+ callback(ts->wpaint->paint.cavity_curve);
+ }
+ if (ts->sculpt) {
+ callback(ts->sculpt->paint.cavity_curve);
+ }
+ if (ts->uvsculpt) {
+ callback(ts->uvsculpt->paint.cavity_curve);
+ }
+ if (ts->gp_paint) {
+ callback(ts->gp_paint->paint.cavity_curve);
+ }
+ if (ts->gp_interpolate.custom_ipo) {
+ callback(ts->gp_interpolate.custom_ipo);
+ }
+ if (ts->gp_sculpt.cur_falloff) {
+ callback(ts->gp_sculpt.cur_falloff);
+ }
+ if (ts->gp_sculpt.cur_primitive) {
+ callback(ts->gp_sculpt.cur_primitive);
+ }
+ callback(ts->imapaint.paint.cavity_curve);
+ }
+
+ FOREACH_NODETREE_BEGIN(bmain, node_tree, id) {
+ LISTBASE_FOREACH(bNode*, node, &node_tree->nodes) {
+ if (ELEM(node->type,
+ SH_NODE_CURVE_VEC,
+ SH_NODE_CURVE_RGB,
+ CMP_NODE_CURVE_VEC,
+ CMP_NODE_CURVE_RGB,
+ CMP_NODE_TIME,
+ CMP_NODE_HUECORRECT,
+ TEX_NODE_CURVE_RGB,
+ TEX_NODE_CURVE_TIME)) {
+ callback((CurveMapping*)node->storage);
+ }
+ }
+ }
+ FOREACH_NODETREE_END;
+
+ LISTBASE_FOREACH(Light*, light, &bmain->lights) {
+ if (light->curfalloff) {
+ callback(light->curfalloff);
+ }
+ }
+
+ LISTBASE_FOREACH(Brush*, brush, &bmain->brushes) {
+ if (brush->curve) {
+ callback(brush->curve);
+ }
+ if (brush->gpencil_settings) {
+ if (brush->gpencil_settings->curve_sensitivity) {
+ callback(brush->gpencil_settings->curve_sensitivity);
+ }
+ if (brush->gpencil_settings->curve_strength) {
+ callback(brush->gpencil_settings->curve_strength);
+ }
+ if (brush->gpencil_settings->curve_jitter) {
+ callback(brush->gpencil_settings->curve_jitter);
+ }
+ }
+ }
+
+ LISTBASE_FOREACH(ParticleSettings*, part, &bmain->particles) {
+ if (part->clumpcurve) {
+ callback(part->clumpcurve);
+ }
+ if (part->roughcurve) {
+ callback(part->roughcurve);
+ }
+ if (part->twistcurve) {
+ callback(part->twistcurve);
+ }
+ }
+
+ /* Object */
+ LISTBASE_FOREACH(Object*, ob, &bmain->objects) {
+ /* Object modifiers */
+ LISTBASE_FOREACH(ModifierData*, md, &ob->modifiers) {
+ if (md->type == eModifierType_Hook) {
+ HookModifierData* hmd = (HookModifierData*)md;
+
+ if (hmd->curfalloff) {
+ callback(hmd->curfalloff);
+ }
+ }
+ else if (md->type == eModifierType_Warp) {
+ WarpModifierData* tmd = (WarpModifierData*)md;
+ if (tmd->curfalloff) {
+ callback(tmd->curfalloff);
+ }
+ }
+ else if (md->type == eModifierType_WeightVGEdit) {
+ WeightVGEditModifierData* wmd = (WeightVGEditModifierData*)md;
+
+ if (wmd->cmap_curve) {
+ callback(wmd->cmap_curve);
+ }
+ }
+ }
+ /* Grease pencil modifiers */
+ LISTBASE_FOREACH(ModifierData*, md, &ob->greasepencil_modifiers) {
+ if (md->type == eGpencilModifierType_Thick) {
+ ThickGpencilModifierData* gpmd = (ThickGpencilModifierData*)md;
+
+ if (gpmd->curve_thickness) {
+ callback(gpmd->curve_thickness);
+ }
+ }
+ else if (md->type == eGpencilModifierType_Hook) {
+ HookGpencilModifierData* gpmd = (HookGpencilModifierData*)md;
+
+ if (gpmd->curfalloff) {
+ callback(gpmd->curfalloff);
+ }
+ }
+ }
+ }
+
+ /* Free Style */
+ LISTBASE_FOREACH(struct FreestyleLineStyle*, linestyle, &bmain->linestyles) {
+ LISTBASE_FOREACH(LineStyleModifier*, m, &linestyle->alpha_modifiers) {
+ switch (m->type) {
+ case LS_MODIFIER_ALONG_STROKE:
+ callback(((LineStyleAlphaModifier_AlongStroke*)m)->curve);
+ break;
+ case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+ callback(((LineStyleAlphaModifier_DistanceFromCamera*)m)->curve);
+ break;
+ case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+ callback(((LineStyleAlphaModifier_DistanceFromObject*)m)->curve);
+ break;
+ case LS_MODIFIER_MATERIAL:
+ callback(((LineStyleAlphaModifier_Material*)m)->curve);
+ break;
+ case LS_MODIFIER_TANGENT:
+ callback(((LineStyleAlphaModifier_Tangent*)m)->curve);
+ break;
+ case LS_MODIFIER_NOISE:
+ callback(((LineStyleAlphaModifier_Noise*)m)->curve);
+ break;
+ case LS_MODIFIER_CREASE_ANGLE:
+ callback(((LineStyleAlphaModifier_CreaseAngle*)m)->curve);
+ break;
+ case LS_MODIFIER_CURVATURE_3D:
+ callback(((LineStyleAlphaModifier_Curvature_3D*)m)->curve);
+ break;
+ }
+ }
+
+ LISTBASE_FOREACH(LineStyleModifier*, m, &linestyle->thickness_modifiers) {
+ switch (m->type) {
+ case LS_MODIFIER_ALONG_STROKE:
+ callback(((LineStyleThicknessModifier_AlongStroke*)m)->curve);
+ break;
+ case LS_MODIFIER_DISTANCE_FROM_CAMERA:
+ callback(((LineStyleThicknessModifier_DistanceFromCamera*)m)->curve);
+ break;
+ case LS_MODIFIER_DISTANCE_FROM_OBJECT:
+ callback(((LineStyleThicknessModifier_DistanceFromObject*)m)->curve);
+ break;
+ case LS_MODIFIER_MATERIAL:
+ callback(((LineStyleThicknessModifier_Material*)m)->curve);
+ break;
+ case LS_MODIFIER_TANGENT:
+ callback(((LineStyleThicknessModifier_Tangent*)m)->curve);
+ break;
+ case LS_MODIFIER_CREASE_ANGLE:
+ callback(((LineStyleThicknessModifier_CreaseAngle*)m)->curve);
+ break;
+ case LS_MODIFIER_CURVATURE_3D:
+ callback(((LineStyleThicknessModifier_Curvature_3D*)m)->curve);
+ break;
+ }
+ }
+ }
+}
- /*
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list