[Bf-blender-cvs] [7187ae5ee10] master: Fix T62510: Crash resetting space type to default

Campbell Barton noreply at git.blender.org
Tue Mar 12 23:13:12 CET 2019


Commit: 7187ae5ee10f4747570eca7964f8078d63de9b82
Author: Campbell Barton
Date:   Wed Mar 13 09:11:50 2019 +1100
Branches: master
https://developer.blender.org/rB7187ae5ee10f4747570eca7964f8078d63de9b82

Fix T62510: Crash resetting space type to default

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

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

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

diff --git a/source/blender/makesrna/intern/rna_screen.c b/source/blender/makesrna/intern/rna_screen.c
index 33e3da6d86c..c42bfd55412 100644
--- a/source/blender/makesrna/intern/rna_screen.c
+++ b/source/blender/makesrna/intern/rna_screen.c
@@ -344,8 +344,8 @@ static void rna_def_area(BlenderRNA *brna)
 	RNA_def_property_update(prop, 0, "rna_Area_type_update");
 
 	prop = RNA_def_property(srna, "ui_type", PROP_ENUM, PROP_NONE);
-	RNA_def_property_enum_items(prop, DummyRNA_DEFAULT_items);  /* infact dummy */
-	RNA_def_property_enum_default(prop, 0);
+	RNA_def_property_enum_items(prop, DummyRNA_NULL_items);  /* infact dummy */
+	RNA_def_property_enum_default(prop, SPACE_VIEW3D << 16);
 	RNA_def_property_enum_funcs(prop, "rna_Area_ui_type_get", "rna_Area_ui_type_set", "rna_Area_ui_type_itemf");
 	RNA_def_property_ui_text(prop, "Editor Type", "Current editor type for this area");
 	RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);



More information about the Bf-blender-cvs mailing list