Tuesday merger of bf-blender into orange branch.
[blender-staging.git] / source / blender / src / header_info.c
index 78bdc169bfaff189ce32d4d0149acc85b8121e3e..5aebdac7c650d4f9c4da73d0d07a615aaa87d83e 100644 (file)
@@ -1264,6 +1264,7 @@ static void do_info_gamemenu(void *arg, int event)
        case G_FILE_SHOW_DEBUG_PROPS:
        case G_FILE_AUTOPLAY:
        case G_FILE_GAME_TO_IPO:
+       case G_FILE_GAME_MAT:
                G.fileflags ^= event;
                break;
        default:
@@ -1298,7 +1299,12 @@ static uiBlock *info_gamemenu(void *arg_unused)
                uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Record Game Physics to IPO",      0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_TO_IPO, "");
        }
        
-       
+       if(G.fileflags & G_FILE_GAME_MAT) {
+               uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_HLT, "Use Blender Materials",     0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT, "");
+       } else {
+               uiDefIconTextBut(block, BUTM, 1, ICON_CHECKBOX_DEHLT, "Use Blender Materials",   0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, G_FILE_GAME_MAT, "");
+       }       
+
 
 
        if(G.fileflags & G_FILE_SHOW_FRAMERATE) {
@@ -1322,7 +1328,7 @@ static uiBlock *info_gamemenu(void *arg_unused)
        }
 
        uiBlockSetDirection(block, UI_DOWN);
-       uiTextBoundsBlock(block, 50);
+       uiTextBoundsBlock(block, 70);
        
        return block;
 }