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

[Ton Roosendaal]

Revision: 19897
          
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=19897
Author:   ton
Date:     2009-04-23 10:13:25 +0200 (Thu, 23 Apr 2009)

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

Last commit from brecht with feature:

* Buttons window data context icon new changes depending on active
  object.

Forgot to check for ob==NULL, crashed files.

Modified Paths:
--------------
    
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c

Modified: 
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
===================================================================
--- 
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
   2009-04-23 07:40:01 UTC (rev 19896)
+++ 
branches/blender2.5/blender/source/blender/editors/space_buttons/buttons_header.c
   2009-04-23 08:13:25 UTC (rev 19897)
@@ -177,10 +177,10 @@
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_WORLD,             
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_WORLD, 0, 0, 
"World");
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_OBJECT_DATA,       
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_OBJECT, 0, 0, 
"Object");
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     dataicon,               
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_DATA, 0, 0, 
"Object Data");
-       if(ELEM5(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT))
+       if(ob && ELEM5(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT))
                uiDefIconButS(block, ROW, B_BUTSPREVIEW,        ICON_MATERIAL,  
                xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, 
(float)BCONTEXT_MATERIAL, 0, 0, "Material");
        uiDefIconButS(block, ROW, B_BUTSPREVIEW,        ICON_TEXTURE,   
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_TEXTURE, 0, 0, 
"Texture");
-       if(ELEM5(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT))
+       if(ob && ELEM5(ob->type, OB_MESH, OB_SURF, OB_MBALL, OB_CURVE, OB_FONT))
                uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_PARTICLES, 
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PARTICLE, 0, 0, 
"Particles");
        uiDefIconButS(block, ROW, B_CONTEXT_SWITCH,     ICON_PHYSICS,   
xco+=XIC, yco, XIC, YIC, &(sbuts->mainb), 0.0, (float)BCONTEXT_PHYSICS, 0, 0, 
"Physics");
        


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