[Bf-blender-cvs] [61c5890c2cc] blender2.8: Fix missing NULL check initializing paint tools
Campbell Barton
noreply at git.blender.org
Sun Nov 4 21:18:24 CET 2018
Commit: 61c5890c2ccb176422fc81955241b8fa81edce46
Author: Campbell Barton
Date: Mon Nov 5 07:15:47 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB61c5890c2ccb176422fc81955241b8fa81edce46
Fix missing NULL check initializing paint tools
===================================================================
M source/blender/blenkernel/intern/paint_toolslots.c
===================================================================
diff --git a/source/blender/blenkernel/intern/paint_toolslots.c b/source/blender/blenkernel/intern/paint_toolslots.c
index e7039d3160f..4f728778b29 100644
--- a/source/blender/blenkernel/intern/paint_toolslots.c
+++ b/source/blender/blenkernel/intern/paint_toolslots.c
@@ -44,6 +44,9 @@ void BKE_paint_toolslots_len_ensure(Paint *paint, int len)
static void paint_toolslots_init(Main *bmain, Scene *scene, Paint *paint)
{
+ if (paint == NULL) {
+ return;
+ }
uint tool_offset = 0;
eObjectMode ob_mode = 0;
bool ok = BKE_paint_brush_tool_info(scene, paint, &tool_offset, &ob_mode);
More information about the Bf-blender-cvs
mailing list