[Bf-blender-cvs] [c99c45a1e35] blender2.8: Fix (unreported) crash when changing active shapekey in Edit mode.

[Bastien Montagne]

Commit: c99c45a1e3563f4b6dad6eb9498a5ae0f386b93d
Author: Bastien Montagne
Date:   Tue Mar 13 14:08:17 2018 +0100
Branches: blender2.8
https://developer.blender.org/rBc99c45a1e3563f4b6dad6eb9498a5ae0f386b93d

Fix (unreported) crash when changing active shapekey in Edit mode.

Looks like someone changed the signature of some RNA update callback,
and for some reason that 'change skey' update function was not updated
(or later got merged from master)...

We'll need RNA to check for its func signatures, some day...

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

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

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

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index e37446028be..b13bf07761f 100644
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -301,9 +301,11 @@ void rna_Object_internal_update_data(Main *UNUSED(bmain), Scene *UNUSED(scene),
 	WM_main_add_notifier(NC_OBJECT | ND_DRAW, ptr->id.data);
 }
 
-static void rna_Object_active_shape_update(bContext *C, Main *bmain, Scene *scene, PointerRNA *ptr)
+static void rna_Object_active_shape_update(bContext *C, PointerRNA *ptr)
 {
 	Object *ob = ptr->id.data;
+	Main *bmain = CTX_data_main(C);
+	Scene *scene = CTX_data_scene(C);
 
 	if (CTX_data_edit_object(C) == ob) {
 		/* exit/enter editmode to get new shape */