[Bf-blender-cvs] [2bad140c09e] greasepencil-object: Fix missing object after reload
Antonio Vazquez
noreply at git.blender.org
Fri Jul 28 16:09:25 CEST 2017
Commit: 2bad140c09e3520f58a239dd03cd78129a48362a
Author: Antonio Vazquez
Date: Fri Jul 28 15:35:54 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB2bad140c09e3520f58a239dd03cd78129a48362a
Fix missing object after reload
When reload a file the lattice object assigned to the modifier was missing.
The object neede a relink inside the modifier
===================================================================
M source/blender/modifiers/intern/MOD_gpencillattice.c
===================================================================
diff --git a/source/blender/modifiers/intern/MOD_gpencillattice.c b/source/blender/modifiers/intern/MOD_gpencillattice.c
index 23eaa3ba28f..84a51ff5372 100644
--- a/source/blender/modifiers/intern/MOD_gpencillattice.c
+++ b/source/blender/modifiers/intern/MOD_gpencillattice.c
@@ -35,16 +35,16 @@
#include "DNA_gpencil_types.h"
#include "BLI_utildefines.h"
+
#include "BKE_DerivedMesh.h"
#include "BKE_gpencil.h"
#include "BKE_lattice.h"
+#include "BKE_library_query.h"
#include "MEM_guardedalloc.h"
#include "MOD_modifiertypes.h"
-#include "DEG_depsgraph.h"
-
static void initData(ModifierData *md)
{
GpencilLatticeModifierData *gpmd = (GpencilLatticeModifierData *)md;
@@ -116,6 +116,15 @@ static bool isDisabled(ModifierData *md, int UNUSED(userRenderParams))
return !mmd->object;
}
+static void foreachObjectLink(
+ ModifierData *md, Object *ob,
+ ObjectWalkFunc walk, void *userData)
+{
+ GpencilLatticeModifierData *mmd = (GpencilLatticeModifierData *)md;
+
+ walk(userData, ob, &mmd->object, IDWALK_CB_NOP);
+}
+
ModifierTypeInfo modifierType_GpencilLattice = {
/* name */ "Lattice",
/* structName */ "GpencilLatticeModifierData",
@@ -137,7 +146,7 @@ ModifierTypeInfo modifierType_GpencilLattice = {
/* updateDepsgraph */ NULL,
/* dependsOnTime */ NULL,
/* dependsOnNormals */ NULL,
- /* foreachObjectLink */ NULL,
+ /* foreachObjectLink */ foreachObjectLink,
/* foreachIDLink */ NULL,
/* foreachTexLink */ NULL,
};
More information about the Bf-blender-cvs
mailing list