[Bf-blender-cvs] [b517dc9b2db] blender2.8: Fix T53638: View layer renaming crashes 1/2

[Dalai Felinto]

Commit: b517dc9b2db01ca6e9c7623f8686fd502280343e
Author: Dalai Felinto
Date:   Wed Dec 27 12:55:00 2017 -0200
Branches: blender2.8
https://developer.blender.org/rBb517dc9b2db01ca6e9c7623f8686fd502280343e

Fix T53638: View layer renaming crashes 1/2

This fixes renaming via the interface.

This bug was introduced originally in 9515737b554. We need the id of the RNA
property to be the one that owns the data (view layer).

So it can't be the window's id, but the scene one instead.

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

M	source/blender/makesrna/intern/rna_wm.c

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

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index d25888e0f93..36f07db727b 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -763,8 +763,10 @@ static PointerRNA rna_Window_view_layer_get(PointerRNA *ptr)
 	Scene *scene = WM_window_get_active_scene(win);
 	WorkSpace *workspace = WM_window_get_active_workspace(win);
 	ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace, scene);
+	PointerRNA scene_ptr;
 
-	return rna_pointer_inherit_refine(ptr, &RNA_ViewLayer, view_layer);
+	RNA_id_pointer_create(&scene->id, &scene_ptr);
+	return rna_pointer_inherit_refine(&scene_ptr, &RNA_ViewLayer, view_layer);
 }
 
 static void rna_Window_view_layer_set(PointerRNA *ptr, PointerRNA value)