[Bf-blender-cvs] [5bfa6d84556] blender2.8: Fix crash in draw manager when no object active

Dalai Felinto noreply at git.blender.org
Sat Apr 1 01:46:52 CEST 2017


Commit: 5bfa6d84556a39f190599325bad1bc52cd681ddd
Author: Dalai Felinto
Date:   Sat Apr 1 00:48:51 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB5bfa6d84556a39f190599325bad1bc52cd681ddd

Fix crash in draw manager when no object active

===================================================================

M	source/blender/draw/intern/draw_common.c

===================================================================

diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c
index bbdbf39256b..0ec2ed67ca2 100644
--- a/source/blender/draw/intern/draw_common.c
+++ b/source/blender/draw/intern/draw_common.c
@@ -294,7 +294,7 @@ int DRW_object_wire_theme_get(Object *ob, SceneLayer *sl, float **color)
 		}
 		else {
 			if ((ob->base_flag & BASE_SELECTED) != 0) {
-				theme_id = (sl->basact->object == ob) ? TH_ACTIVE : TH_SELECT;
+				theme_id = (sl->basact && sl->basact->object == ob) ? TH_ACTIVE : TH_SELECT;
 			}
 			else {
 				if (ob->type == OB_LAMP) theme_id = TH_LAMP;




More information about the Bf-blender-cvs mailing list