[Bf-blender-cvs] [b00cfb77cd] render-layers: Use active_object instead of active_base for edit mode enter

Dalai Felinto noreply at git.blender.org
Wed Jan 11 11:05:37 CET 2017


Commit: b00cfb77cd3f2627e14d62ce565cdb9afc9a9d1f
Author: Dalai Felinto
Date:   Wed Jan 11 11:05:19 2017 +0100
Branches: render-layers
https://developer.blender.org/rBb00cfb77cd3f2627e14d62ce565cdb9afc9a9d1f

Use active_object instead of active_base for edit mode enter

(prevent a crash after recent Base > ObjectBase commit)

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

M	source/blender/editors/object/object_edit.c

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

diff --git a/source/blender/editors/object/object_edit.c b/source/blender/editors/object/object_edit.c
index ab7ebfc7d1..51fa05136a 100644
--- a/source/blender/editors/object/object_edit.c
+++ b/source/blender/editors/object/object_edit.c
@@ -465,24 +465,21 @@ void ED_object_editmode_enter(bContext *C, int flag)
 {
 	Scene *scene = CTX_data_scene(C);
 	SceneLayer *sl = CTX_data_scene_layer(C);
-	ObjectBase *base = NULL;
 	Object *ob;
 	bool ok = false;
 
 	if (ID_IS_LINKED_DATABLOCK(scene)) return;
 
 	if ((flag & EM_IGNORE_LAYER) == 0) {
-		base = CTX_data_active_base(C); /* active layer checked here for view3d */
+		ob = CTX_data_active_object(C); /* active layer checked here for view3d */
 
-		if (base == NULL) return;
+		if (ob == NULL) return;
 	}
 	else {
-		base = sl->basact;
+		ob = sl->basact->object;
 	}
 
-	if (ELEM(NULL, base, base->object, base->object->data)) return;
-
-	ob = base->object;
+	if (ELEM(NULL, ob, ob->data)) return;
 
 	/* this checks actual object->data, for cases when other scenes have it in editmode context */
 	if (BKE_object_is_in_editmode(ob))




More information about the Bf-blender-cvs mailing list