diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 03:24:37 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-11-14 03:27:42 +0300 |
| commit | 2b3b481c3d6553e7a4dd90efc25518fe8e1a5bc6 (patch) | |
| tree | e71363a67c25d8ff951c1541069fb50d8974ab5a /source/blender/windowmanager | |
| parent | 91d0c7f9793e4a4a72a959c921b654faa795b17e (diff) | |
| parent | b97a2c3688ad29b051898ff2be5f9b9e98bebdba (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_toolsystem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/windowmanager/intern/wm_toolsystem.c b/source/blender/windowmanager/intern/wm_toolsystem.c index b1b5b5450fa..7b91f8360ff 100644 --- a/source/blender/windowmanager/intern/wm_toolsystem.c +++ b/source/blender/windowmanager/intern/wm_toolsystem.c @@ -281,7 +281,7 @@ static void toolsystem_ref_link(bContext *C, WorkSpace *workspace, bToolRef *tre } else { const ePaintMode paint_mode = BKE_paintmode_get_from_tool(tref); - BLI_assert(paint_mode != ePaintInvalid); + BLI_assert(paint_mode != PAINT_MODE_INVALID); const EnumPropertyItem *items = BKE_paint_get_tool_enum_from_paintmode(paint_mode); BLI_assert(items != NULL); |