[Bf-blender-cvs] [7e0b48e58f5] greasepencil-object: GPencil: Fix rebase error
Clément Foucault
noreply at git.blender.org
Thu Mar 5 17:40:50 CET 2020
Commit: 7e0b48e58f5aa9ede4cafe56854349e66f2152e2
Author: Clément Foucault
Date: Thu Mar 5 17:40:35 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rB7e0b48e58f5aa9ede4cafe56854349e66f2152e2
GPencil: Fix rebase error
===================================================================
M source/blender/blenloader/intern/versioning_280.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 2a35084f876..a46f997ff43 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -661,27 +661,6 @@ static void do_versions_area_ensure_tool_region(Main *bmain,
}
}
}
-
- /* Grease pencil noise modifier curve. */
- if (!DNA_struct_elem_find(fd->filesdna, "NoiseGpencilModifierData", "float", "factor_uvs")) {
- LISTBASE_FOREACH (Object *, ob, &bmain->objects) {
- LISTBASE_FOREACH (ModifierData *, md, &ob->greasepencil_modifiers) {
- if (md->type == eGpencilModifierType_Noise) {
- NoiseGpencilModifierData *gpmd = (NoiseGpencilModifierData *)md;
- gpmd->factor_thickness = gpmd->factor;
- gpmd->factor_strength = gpmd->factor;
- gpmd->factor_uvs = gpmd->factor;
-
- if (gpmd->curve_intensity) {
- gpmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
- if (gpmd->curve_intensity) {
- BKE_curvemapping_initialize(gpmd->curve_intensity);
- }
- }
- }
- }
- }
- }
}
}
@@ -4627,6 +4606,20 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
break;
}
+ case eGpencilModifierType_Noise: {
+ NoiseGpencilModifierData *gpmd = (NoiseGpencilModifierData *)md;
+ gpmd->factor_thickness = gpmd->factor;
+ gpmd->factor_strength = gpmd->factor;
+ gpmd->factor_uvs = gpmd->factor;
+
+ if (gpmd->curve_intensity) {
+ gpmd->curve_intensity = BKE_curvemapping_add(1, 0.0f, 0.0f, 1.0f, 1.0f);
+ if (gpmd->curve_intensity) {
+ BKE_curvemapping_initialize(gpmd->curve_intensity);
+ }
+ }
+ break;
+ }
case eGpencilModifierType_Tint: {
TintGpencilModifierData *mmd = (TintGpencilModifierData *)md;
srgb_to_linearrgb_v3_v3(mmd->rgb, mmd->rgb);
More information about the Bf-blender-cvs
mailing list