[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57214] trunk/blender/source/blender/ makesrna/intern/rna_wm.c: fix [#35468] screen list shows temp layout
Campbell Barton
ideasman42 at gmail.com
Mon Jun 3 06:06:55 CEST 2013
Revision: 57214
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57214
Author: campbellbarton
Date: 2013-06-03 04:06:54 +0000 (Mon, 03 Jun 2013)
Log Message:
-----------
fix [#35468] screen list shows temp layout
Modified Paths:
--------------
trunk/blender/source/blender/makesrna/intern/rna_wm.c
Modified: trunk/blender/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_wm.c 2013-06-03 03:47:41 UTC (rev 57213)
+++ trunk/blender/source/blender/makesrna/intern/rna_wm.c 2013-06-03 04:06:54 UTC (rev 57214)
@@ -585,6 +585,14 @@
win->newscreen = value.data;
}
+int rna_Window_screen_assign_poll(PointerRNA *ptr, PointerRNA value)
+{
+ bScreen *screen = (bScreen *)value.id.data;
+
+ return !screen->temp;
+}
+
+
static void rna_Window_screen_update(bContext *C, PointerRNA *ptr)
{
wmWindow *win = (wmWindow *)ptr->data;
@@ -1706,7 +1714,7 @@
RNA_def_property_struct_type(prop, "Screen");
RNA_def_property_ui_text(prop, "Screen", "Active screen showing in the window");
RNA_def_property_flag(prop, PROP_EDITABLE);
- RNA_def_property_pointer_funcs(prop, NULL, "rna_Window_screen_set", NULL, NULL);
+ RNA_def_property_pointer_funcs(prop, NULL, "rna_Window_screen_set", NULL, "rna_Window_screen_assign_poll");
RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
RNA_def_property_update(prop, 0, "rna_Window_screen_update");
More information about the Bf-blender-cvs
mailing list