Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Tue, 25 Sep 2018 01:42:44 +0000 (11:42 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 25 Sep 2018 01:50:47 +0000 (11:50 +1000)
commitd915e6dc8d9f99756e0b066bda075a8fe8d00dae
treea93ed68506ab024f4787b886021052a45d948527
parentc4806bbcb9ceafb938386d207245e36ecabab134
parent10fbea8845d6994bce0ccbdad763793548ef757d
Merge branch 'master' into blender2.8
source/blender/blenkernel/intern/effect.c