diff options
| author | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2021-08-27 07:41:41 +0300 |
| commit | a0f754e7749a485c97718433edbbab5ac76cdc7a (patch) | |
| tree | d968d66e73be6dbac5997a3f5bb8e33e462c96d3 /source/blender/blenkernel/intern/shader_fx.c | |
| parent | 137a5e162c2435662dbb299ff49771e7d2e7598f (diff) | |
| parent | 523bc981cfeecead5050e7af44bbe252c166d718 (diff) | |
Merge branch 'master' into refactor-idprop-ui-datarefactor-idprop-ui-data
Diffstat (limited to 'source/blender/blenkernel/intern/shader_fx.c')
| -rw-r--r-- | source/blender/blenkernel/intern/shader_fx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/shader_fx.c b/source/blender/blenkernel/intern/shader_fx.c index 29cbe05f4d1..12017907038 100644 --- a/source/blender/blenkernel/intern/shader_fx.c +++ b/source/blender/blenkernel/intern/shader_fx.c @@ -326,7 +326,7 @@ void BKE_shaderfx_blend_read_lib(BlendLibReader *reader, Object *ob) BKE_shaderfx_foreach_ID_link(ob, BKE_object_modifiers_lib_link_common, reader); /* If linking from a library, clear 'local' library override flag. */ - if (ob->id.lib != NULL) { + if (ID_IS_LINKED(ob)) { LISTBASE_FOREACH (ShaderFxData *, fx, &ob->shader_fx) { fx->flag &= ~eShaderFxFlag_OverrideLibrary_Local; } |