Commit: f3cf29ac96937bec76e6cfeb6b143625a814bc03 Author: Philipp Oeser Date: Tue May 26 11:31:58 2020 +0200 Branches: blender-v2.83-release https://developer.blender.org/rBf3cf29ac96937bec76e6cfeb6b143625a814bc03
Fix T77074: Collections: Exclude From ViewLayer toggle crashes Consider this a bandaid fix (similar to rBe2724abc22d5). Real issue seems to be that object is still in OB_MODE_PARTICLE_EDIT whereas it should be in OB_MODE_OBJECT after toggling 'Exclude From ViewLayer'. So while this patch prevents the crash, it leaves the object in a weird state (it cannot be selected for example), needs further investigation. Maniphest Tasks: T77074 Differential Revision: https://developer.blender.org/D7843 =================================================================== M source/blender/draw/engines/overlay/overlay_engine.c =================================================================== diff --git a/source/blender/draw/engines/overlay/overlay_engine.c b/source/blender/draw/engines/overlay/overlay_engine.c index 586b99c14da..0e1bbaf284d 100644 --- a/source/blender/draw/engines/overlay/overlay_engine.c +++ b/source/blender/draw/engines/overlay/overlay_engine.c @@ -243,7 +243,8 @@ static void OVERLAY_cache_populate(void *vedata, Object *ob) const bool renderable = DRW_object_is_renderable(ob); const bool in_pose_mode = ob->type == OB_ARMATURE && OVERLAY_armature_is_pose_mode(ob, draw_ctx); const bool in_edit_mode = overlay_object_is_edit_mode(pd, ob); - const bool in_particle_edit_mode = ob->mode == OB_MODE_PARTICLE_EDIT; + const bool in_particle_edit_mode = (ob->mode == OB_MODE_PARTICLE_EDIT) && + (pd->ctx_mode == CTX_MODE_PARTICLE); const bool in_paint_mode = (ob == draw_ctx->obact) && (draw_ctx->object_mode & OB_MODE_ALL_PAINT); const bool in_sculpt_mode = (ob == draw_ctx->obact) && (ob->sculpt != NULL) && _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
