diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-07-25 10:36:49 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-07-25 10:36:49 +0300 |
| commit | 9bdd12d884c5130397e67f72caad2770d9524c9a (patch) | |
| tree | f26951742aadf0c14810ed581bad9393cc2d23ec /source/blender/editors/render/render_shading.c | |
| parent | d99532e1d8fd49019003046dcf471c85a52e0398 (diff) | |
| parent | d1dc5e0a53c5a3484b7d20eb3a9847b53a227791 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/render/render_shading.c')
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index ca21cb50717..5071c5db4ea 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -1822,7 +1822,7 @@ static void paste_mtex_copybuf(ID *id) mtex = &(((FreestyleLineStyle *)id)->mtex[(int)((FreestyleLineStyle *)id)->texact]); break; default: - BLI_assert("invalid id type"); + BLI_assert(!"invalid id type"); return; } |