diff options
| author | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
|---|---|---|
| committer | Hans Goudey <h.goudey@me.com> | 2020-08-12 04:59:16 +0300 |
| commit | ef11238c743e6985fe325280fb13e05d6ec27378 (patch) | |
| tree | 1dd2605a676bee52296535825b99f000a9c255eb /source/blender/blenkernel/intern/texture.c | |
| parent | 1f768bbe4145daed111636ca09dd53b25b8d29b5 (diff) | |
| parent | ec5f39208785c1bbe723054ffe69e1ac2ab470dd (diff) | |
Merge branch 'master' into property-search-uiproperty-search-ui
Diffstat (limited to 'source/blender/blenkernel/intern/texture.c')
| -rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index e2c3c20e36e..8d5a0497e28 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -664,11 +664,11 @@ bool BKE_texture_dependsOnTime(const struct Tex *texture) if (texture->ima && BKE_image_is_animated(texture->ima)) { return true; } - else if (texture->adt) { + if (texture->adt) { /* assume anything in adt means the texture is animated */ return true; } - else if (texture->type == TEX_NOISE) { + if (texture->type == TEX_NOISE) { /* noise always varies with time */ return true; } |