[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20300] branches/blender2.5/blender/source /blender/editors: 2.5

[Ton Roosendaal]

Revision: 20300
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20300
Author:   ton
Date:     2009-05-20 18:23:55 +0200 (Wed, 20 May 2009)

Log Message:
-----------
2.5

Fixes:

- Render (F12) would choose the (hidden) info window in cases, disabled
  that.
- Browsing ID's (like Image in Image editor) failed when no ID was
  assigned yet.

Modified Paths:
--------------
    
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
    branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c

Modified: 
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c  
    2009-05-20 15:59:57 UTC (rev 20299)
+++ 
branches/blender2.5/blender/source/blender/editors/interface/interface_utils.c  
    2009-05-20 16:23:55 UTC (rev 20300)
@@ -404,11 +404,11 @@
                        else return;
                        break;
                case UI_ID_BROWSE: {
-                       if(id==0) id= lb->first;
-                       if(id==0) return;
+                       /* ID can be NULL, if nothing was assigned yet */
+                       if(lb->first==NULL) return;
 
                        if(params->browsenr== -2) {
-                               /* XXX implement or find a replacement
+                               /* XXX implement or find a replacement (ID can 
be NULL!)
                                 * activate_databrowse((ID *)G.buts->lockpoin, 
GS(id->name), 0, B_MESHBROWSE, &params->browsenr, do_global_buttons); */
                                return;
                        }

Modified: branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c      
2009-05-20 15:59:57 UTC (rev 20299)
+++ branches/blender2.5/blender/source/blender/editors/screen/screen_ops.c      
2009-05-20 16:23:55 UTC (rev 20300)
@@ -1979,7 +1979,7 @@
        short foundwin= 0;
        
        for(sa= sc->areabase.first; sa; sa= sa->next) {
-               if(sa->winx > 10 && sa->winy > 10) {
+               if(sa->winx > 30 && sa->winy > 30) {
                        size= sa->winx*sa->winy;
                        if(sa->spacetype == SPACE_BUTS) {
                                if(foundwin == 0 && size > bwmaxsize) {


_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs