merge with/from trunk at r35190
[blender.git] / source / blender / editors / space_image / image_header.c
index 0ec917846fdeee73a8edd5a12d1e9da98efd5ab5..be481053693201db19ad9195b7ac522304bc10ff 100644 (file)
@@ -1,4 +1,4 @@
-/**
+/*
  * $Id$
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
 #include "DNA_space_types.h"
 #include "DNA_windowmanager_types.h"
 
-
 #include "BLI_blenlib.h"
 #include "BLI_editVert.h"
+#include "BLI_utildefines.h"
 
 #include "BKE_context.h"
 #include "BKE_mesh.h"
 
-
 #include "ED_image.h"
 
 #include "WM_types.h"
 
-
 #include "UI_interface.h"
 
-
-
 #include "image_intern.h"
 
 /********************** toolbox operator *********************/
 
-static int toolbox_invoke(bContext *C, wmOperator *op, wmEvent *event)
+static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event))
 {
        SpaceImage *sima= CTX_wm_space_image(C);
        Object *obedit= CTX_data_edit_object(C);
@@ -64,13 +60,13 @@ static int toolbox_invoke(bContext *C, wmOperator *op, wmEvent *event)
 
        show_uvedit= ED_space_image_show_uvedit(sima, obedit);
 
-       pup= uiPupMenuBegin(C, "Toolbox", 0);
+       pup= uiPupMenuBegin(C, "Toolbox", ICON_NULL);
        layout= uiPupMenuLayout(pup);
 
-       uiItemM(layout, C, "IMAGE_MT_view", NULL, 0);
-       if(show_uvedit) uiItemM(layout, C, "IMAGE_MT_select", NULL, 0);
-       uiItemM(layout, C, "IMAGE_MT_image", NULL, 0);
-       if(show_uvedit) uiItemM(layout, C, "IMAGE_MT_uvs", NULL, 0);
+       uiItemM(layout, C, "IMAGE_MT_view", NULL, ICON_NULL);
+       if(show_uvedit) uiItemM(layout, C, "IMAGE_MT_select", NULL, ICON_NULL);
+       uiItemM(layout, C, "IMAGE_MT_image", NULL, ICON_NULL);
+       if(show_uvedit) uiItemM(layout, C, "IMAGE_MT_uvs", NULL, ICON_NULL);
 
        uiPupMenuEnd(C, pup);