[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23167] trunk/blender/source/blender: 2. 5 - UI Bugfixes

[Joshua Leung]

Revision: 23167
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23167
Author:   aligorith
Date:     2009-09-13 05:30:51 +0200 (Sun, 13 Sep 2009)

Log Message:
-----------
2.5 - UI Bugfixes

* Loading newly saved files (where linked-libs were used) crashed. 
However, libraries still don't get loaded correctly yet for some reason...

* Pointer layout-items now draw without their UI text if their name is set to "" (i.e. text=""), making the ones with icons appear normal. This is kindof a hack, since it would be better to expose icon_only, but this way is less work.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2009-09-13 03:08:46 UTC (rev 23166)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2009-09-13 03:30:51 UTC (rev 23167)
@@ -11062,9 +11062,10 @@
 
 					printf("read library: lib %s\n", mainptr->curlib->name);
 					fd= blo_openblenderfile(mainptr->curlib->filename, &reports);
-					fd->reports= basefd->reports;
 
 					if (fd) {
+						fd->reports= basefd->reports;
+						
 						if (fd->libmap)
 							oldnewmap_free(fd->libmap);
 

Modified: trunk/blender/source/blender/makesrna/intern/rna_ui_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_ui_api.c	2009-09-13 03:08:46 UTC (rev 23166)
+++ trunk/blender/source/blender/makesrna/intern/rna_ui_api.c	2009-09-13 03:30:51 UTC (rev 23167)
@@ -44,6 +44,9 @@
 	flag |= (slider)? UI_ITEM_R_SLIDER: 0;
 	flag |= (expand)? UI_ITEM_R_EXPAND: 0;
 	flag |= (toggle)? UI_ITEM_R_TOGGLE: 0;
+	
+		// XXX: an 'icon_only' prop should be added instead, but for now, this makes ptrs look ok
+	flag |= (name && name[0]==0)? UI_ITEM_R_ICON_ONLY: 0; 
 
 	uiItemR(layout, name, icon, ptr, propname, flag);
 }