[Bf-blender-cvs] [4ed7c10a329] blender2.8: Correct missing NULL check in recent changes
Campbell Barton
noreply at git.blender.org
Fri Nov 23 08:12:47 CET 2018
Commit: 4ed7c10a329f4a1900e0a3783d3eb478a0e12129
Author: Campbell Barton
Date: Fri Nov 23 18:12:28 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB4ed7c10a329f4a1900e0a3783d3eb478a0e12129
Correct missing NULL check in recent changes
===================================================================
M source/blender/editors/space_view3d/view3d_view.c
===================================================================
diff --git a/source/blender/editors/space_view3d/view3d_view.c b/source/blender/editors/space_view3d/view3d_view.c
index d250386c660..f8f2e9635e4 100644
--- a/source/blender/editors/space_view3d/view3d_view.c
+++ b/source/blender/editors/space_view3d/view3d_view.c
@@ -896,7 +896,7 @@ static bool drw_select_loop_pass(eDRWSelectStage stage, void *user_data)
eV3DSelectObjectFilter ED_view3d_select_filter_from_mode(const Scene *scene, const Object *obact)
{
if (scene->toolsettings->object_flag & SCE_OBJECT_MODE_LOCK) {
- if ((obact->mode & OB_MODE_WEIGHT_PAINT) &&
+ if (obact && (obact->mode & OB_MODE_WEIGHT_PAINT) &&
BKE_object_pose_armature_get((Object *)obact))
{
return VIEW3D_SELECT_FILTER_WPAINT_POSE_MODE_LOCK;
More information about the Bf-blender-cvs
mailing list