diff options
| author | Lukas Stockner <lukas.stockner@freenet.de> | 2019-07-31 22:13:29 +0300 |
|---|---|---|
| committer | Lukas Stockner <lukas.stockner@freenet.de> | 2019-07-31 22:24:34 +0300 |
| commit | ea3690e32974005c6ccb871f4e2f49471ad837ab (patch) | |
| tree | d7145b6ed375599ee5534c5a1cd102012baf8150 /source/blender/blenkernel/intern/paint_toolslots.c | |
| parent | 77d7cc9ba7a9c23c269cb89e8f6da9c800558973 (diff) | |
Fix several undefined-behaviour-sanitizer warnings
Reviewers: brecht
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D4222
Diffstat (limited to 'source/blender/blenkernel/intern/paint_toolslots.c')
| -rw-r--r-- | source/blender/blenkernel/intern/paint_toolslots.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c index fbf586e3f49..abaf5a96481 100644 --- a/source/blender/blenkernel/intern/paint_toolslots.c +++ b/source/blender/blenkernel/intern/paint_toolslots.c @@ -67,11 +67,16 @@ void BKE_paint_toolslots_init_from_main(struct Main *bmain) for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) { ToolSettings *ts = scene->toolsettings; paint_toolslots_init(bmain, &ts->imapaint.paint); - paint_toolslots_init(bmain, &ts->sculpt->paint); - paint_toolslots_init(bmain, &ts->vpaint->paint); - paint_toolslots_init(bmain, &ts->wpaint->paint); - paint_toolslots_init(bmain, &ts->uvsculpt->paint); - paint_toolslots_init(bmain, &ts->gp_paint->paint); + if (ts->sculpt) + paint_toolslots_init(bmain, &ts->sculpt->paint); + if (ts->vpaint) + paint_toolslots_init(bmain, &ts->vpaint->paint); + if (ts->wpaint) + paint_toolslots_init(bmain, &ts->wpaint->paint); + if (ts->uvsculpt) + paint_toolslots_init(bmain, &ts->uvsculpt->paint); + if (ts->gp_paint) + paint_toolslots_init(bmain, &ts->gp_paint->paint); } } |