[Bf-blender-cvs] [3db43918d25] custom-manipulators: Fix from merge

Campbell Barton noreply at git.blender.org
Fri Jun 2 16:41:01 CEST 2017


Commit: 3db43918d25d3dde887599f0a71a7b3c27b740f8
Author: Campbell Barton
Date:   Sat Jun 3 00:41:15 2017 +1000
Branches: custom-manipulators
https://developer.blender.org/rB3db43918d25d3dde887599f0a71a7b3c27b740f8

Fix from merge

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

M	source/blender/windowmanager/intern/wm_event_system.c

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

diff --git a/source/blender/windowmanager/intern/wm_event_system.c b/source/blender/windowmanager/intern/wm_event_system.c
index 8bb3f9ffae2..025e2d81f9d 100644
--- a/source/blender/windowmanager/intern/wm_event_system.c
+++ b/source/blender/windowmanager/intern/wm_event_system.c
@@ -343,7 +343,7 @@ void wm_event_do_notifiers(bContext *C)
 			}
 			if (note->category == NC_SCENE) {
 				if (note->data == ND_OB_ACTIVE) {
-					SceneLayer *sl = BKE_scene_layer_context_active(win->screen->scene);
+					SceneLayer *sl = BKE_scene_layer_context_active(scene);
 					if (sl->basact) {
 						Object *ob = sl->basact->object;
 						if (ob->type == OB_ARMATURE) {




More information about the Bf-blender-cvs mailing list