[Bf-blender-cvs] [741d848cf8e] blender2.8: Fix crash with no active object

Luca Rood noreply at git.blender.org
Fri May 5 18:00:37 CEST 2017


Commit: 741d848cf8ee2d6f682150fc965036f6185655a3
Author: Luca Rood
Date:   Fri May 5 17:57:50 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB741d848cf8ee2d6f682150fc965036f6185655a3

Fix crash with no active object

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

M	source/blender/draw/modes/object_mode.c

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

diff --git a/source/blender/draw/modes/object_mode.c b/source/blender/draw/modes/object_mode.c
index 4a892cb4ce9..c4add618e10 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1189,7 +1189,7 @@ static void OBJECT_cache_populate(void *vedata, Object *ob)
 
 	if (do_outlines) {
 		Object *obedit = scene->obedit;
-		if (ob != obedit && !(sl->basact->object == ob && ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT))) {
+		if (ob != obedit && !(OBACT_NEW == ob && ob->mode & (OB_MODE_WEIGHT_PAINT | OB_MODE_VERTEX_PAINT))) {
 			struct Batch *geom = DRW_cache_object_surface_get(ob);
 			if (geom) {
 				theme_id = DRW_object_wire_theme_get(ob, sl, NULL);




More information about the Bf-blender-cvs mailing list