diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-09-06 04:31:00 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-06 04:31:00 +0400 |
| commit | c64336390569a344f972ce41d8a1fb96d3c9c38f (patch) | |
| tree | ca5d281e088c2024e536f3a832c9606f99e46bc3 /source/blender/makesrna/intern/rna_screen.c | |
| parent | 5a3c6ccadb8925d6e2b1da2b2861de35b33f939f (diff) | |
| parent | bf5a6531a61638b74b9e80e055e00c2b97483fdf (diff) | |
svn merge -r39930:39947 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/makesrna/intern/rna_screen.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_screen.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c index be4adb405e2..59707f05e6f 100644 --- a/source/blender/makesrna/intern/rna_screen.c +++ b/source/blender/makesrna/intern/rna_screen.c @@ -68,13 +68,13 @@ static void rna_Screen_scene_set(PointerRNA *ptr, PointerRNA value) sc->newscene= value.data; } -static void rna_Screen_scene_update(bContext *C, PointerRNA *ptr) +static void rna_Screen_scene_update(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr) { bScreen *sc= (bScreen*)ptr->data; /* exception: can't set screens inside of area/region handers */ if(sc->newscene) { - WM_event_add_notifier(C, NC_SCENE|ND_SCENEBROWSE, sc->newscene); + WM_main_add_notifier(NC_SCENE|ND_SCENEBROWSE, sc->newscene); sc->newscene= NULL; } } @@ -231,7 +231,6 @@ static void rna_def_screen(BlenderRNA *brna) RNA_def_property_flag(prop, PROP_EDITABLE|PROP_NEVER_NULL); RNA_def_property_pointer_funcs(prop, NULL, "rna_Screen_scene_set", NULL, NULL); RNA_def_property_ui_text(prop, "Scene", "Active scene to be edited in the screen"); - RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); RNA_def_property_update(prop, 0, "rna_Screen_scene_update"); /* collections */ |