[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60420] trunk/blender/source/blender: Fix [#36830] 'Reset to Default Value' on Current Area Type button causes crash

[Bastien Montagne]

Revision: 60420
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60420
Author:   mont29
Date:     2013-09-29 13:25:42 +0000 (Sun, 29 Sep 2013)
Log Message:
-----------
Fix [#36830] 'Reset to Default Value' on Current Area Type button causes crash

Default default value for space types (0, i.e. SPACE_EMPTY) is not valid, use SPACE_VIEW3D instead.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/screen.c
    trunk/blender/source/blender/editors/screen/area.c
    trunk/blender/source/blender/makesrna/intern/rna_screen.c

Modified: trunk/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/screen.c	2013-09-29 13:14:09 UTC (rev 60419)
+++ trunk/blender/source/blender/blenkernel/intern/screen.c	2013-09-29 13:25:42 UTC (rev 60420)
@@ -112,7 +112,7 @@
 		if (art->regionid == regionid)
 			return art;
 	
-	printf("Error, region type missing in - name:\"%s\", id:%d\n", st->name, st->spaceid);
+	printf("Error, region type %d missing in - name:\"%s\", id:%d\n", regionid, st->name, st->spaceid);
 	return st->regiontypes.first;
 }
 

Modified: trunk/blender/source/blender/editors/screen/area.c
===================================================================
--- trunk/blender/source/blender/editors/screen/area.c	2013-09-29 13:14:09 UTC (rev 60419)
+++ trunk/blender/source/blender/editors/screen/area.c	2013-09-29 13:25:42 UTC (rev 60420)
@@ -1446,7 +1446,6 @@
 		}
 		
 		if (sl) {
-			
 			/* swap regions */
 			slold->regionbase = sa->regionbase;
 			sa->regionbase = sl->regionbase;

Modified: trunk/blender/source/blender/makesrna/intern/rna_screen.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_screen.c	2013-09-29 13:14:09 UTC (rev 60419)
+++ trunk/blender/source/blender/makesrna/intern/rna_screen.c	2013-09-29 13:25:42 UTC (rev 60420)
@@ -213,6 +213,7 @@
 	prop = RNA_def_property(srna, "type", PROP_ENUM, PROP_NONE);
 	RNA_def_property_enum_sdna(prop, NULL, "spacetype");
 	RNA_def_property_enum_items(prop, space_type_items);
+	RNA_def_property_enum_default(prop, SPACE_VIEW3D);
 	RNA_def_property_enum_funcs(prop, NULL, "rna_Area_type_set", "rna_Area_type_itemf");
 	RNA_def_property_ui_text(prop, "Editor Type", "Current editor type for this area");
 	RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);