[Bf-blender-cvs] [c0aae838aba] soc-2019-npr: LANPR: red-out modifier name when target is not set.

YimingWu noreply at git.blender.org
Tue Jun 25 07:26:10 CEST 2019


Commit: c0aae838aba186b0fe41b112be307fa1cf113008
Author: YimingWu
Date:   Tue Jun 25 13:25:36 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc0aae838aba186b0fe41b112be307fa1cf113008

LANPR: red-out modifier name when target is not set.

===================================================================

M	source/blender/modifiers/intern/MOD_featureline.c

===================================================================

diff --git a/source/blender/modifiers/intern/MOD_featureline.c b/source/blender/modifiers/intern/MOD_featureline.c
index b844eb9ae19..a9019062482 100644
--- a/source/blender/modifiers/intern/MOD_featureline.c
+++ b/source/blender/modifiers/intern/MOD_featureline.c
@@ -95,6 +95,13 @@ static void foreachObjectLink(ModifierData *md, Object *ob, ObjectWalkFunc walk,
   walk(userData, ob, &flmd->target, IDWALK_NOP);
 }
 
+static bool isDisabled(const struct Scene *scene, struct ModifierData *md, bool userRenderParams){
+  FeatureLineModifierData *flmd = (FeatureLineModifierData *)md;
+  if(!flmd->target)
+    return true;
+  return false;
+}
+
 ModifierTypeInfo modifierType_FeatureLine = {
     /* name */ "Feature Line",
     /* structName */ "FeatureLineModifierData",
@@ -112,7 +119,7 @@ ModifierTypeInfo modifierType_FeatureLine = {
     /* initData */ initData,
     /* requiredDataMask */ requiredDataMask,
     /* freeData */ freeData,
-    /* isDisabled */ NULL,
+    /* isDisabled */ isDisabled,
     /* updateDepsgraph */ NULL,
     /* dependsOnTime */ dependsOnTime,
     /* dependsOnNormals */ NULL,



More information about the Bf-blender-cvs mailing list