use ICON_NULL define rather then 0, makes UI calls less confusing. (no functional...
authorCampbell Barton <ideasman42@gmail.com>
Thu, 23 Dec 2010 02:43:40 +0000 (02:43 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 23 Dec 2010 02:43:40 +0000 (02:43 +0000)
 eg: uiItemR(row, &dvar_ptr, "type", 0, "", 0); -> uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NULL);

46 files changed:
source/blender/editors/animation/anim_channels_defines.c
source/blender/editors/animation/fmodifier_ui.c
source/blender/editors/animation/keyingsets.c
source/blender/editors/armature/editarmature.c
source/blender/editors/armature/poselib.c
source/blender/editors/armature/poseobject.c
source/blender/editors/curve/editcurve.c
source/blender/editors/gpencil/gpencil_buttons.c
source/blender/editors/include/UI_interface.h
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_icons.c
source/blender/editors/interface/interface_layout.c
source/blender/editors/interface/interface_regions.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/interface/interface_utils.c
source/blender/editors/interface/interface_widgets.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_constraint.c
source/blender/editors/object/object_relations.c
source/blender/editors/object/object_select.c
source/blender/editors/screen/screen_ops.c
source/blender/editors/sound/sound_ops.c
source/blender/editors/space_buttons/buttons_ops.c
source/blender/editors/space_file/file_panels.c
source/blender/editors/space_graph/graph_buttons.c
source/blender/editors/space_graph/graph_edit.c
source/blender/editors/space_image/image_buttons.c
source/blender/editors/space_image/image_header.c
source/blender/editors/space_image/image_ops.c
source/blender/editors/space_info/info_ops.c
source/blender/editors/space_info/space_info.c
source/blender/editors/space_logic/logic_window.c
source/blender/editors/space_nla/nla_buttons.c
source/blender/editors/space_nla/nla_edit.c
source/blender/editors/space_node/drawnode.c
source/blender/editors/space_node/node_draw.c
source/blender/editors/space_node/node_header.c
source/blender/editors/space_outliner/outliner.c
source/blender/editors/space_text/text_header.c
source/blender/editors/space_text/text_ops.c
source/blender/editors/space_view3d/view3d_buttons.c
source/blender/editors/space_view3d/view3d_header.c
source/blender/editors/space_view3d/view3d_select.c
source/blender/editors/space_view3d/view3d_toolbar.c
source/blender/editors/transform/transform_ops.c
source/blender/windowmanager/intern/wm_operators.c

index 8cc159b..4781223 100644 (file)
@@ -3253,7 +3253,7 @@ void ANIM_channel_draw_widgets (bAnimContext *ac, bAnimListElem *ale, uiBlock *b
                                                uiBut *but;
                                                
                                                /* create the slider button, and assign relevant callback to ensure keyframes are inserted... */
-                                               but= uiDefAutoButR(block, &ptr, prop, array_index, "", 0, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc);
+                                               but= uiDefAutoButR(block, &ptr, prop, array_index, "", ICON_NULL, (int)v2d->cur.xmax-offset, ymid, SLIDER_WIDTH, (int)ymaxc-yminc);
                                                
                                                /* assign keyframing function according to slider type */
                                                if (ale->type == ANIMTYPE_SHAPEKEY)
index 2b8d0f3..7642f63 100644 (file)
@@ -225,14 +225,14 @@ static void draw_modifier__fn_generator(uiLayout *layout, ID *id, FModifier *fcm
        
        /* add the settings */
        col= uiLayoutColumn(layout, 1);
-               uiItemR(col, &ptr, "function_type", 0, "", 0);
-               uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, 0);
+               uiItemR(col, &ptr, "function_type", 0, "", ICON_NULL);
+               uiItemR(col, &ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
        
        col= uiLayoutColumn(layout, 0); // no grouping for now
-               uiItemR(col, &ptr, "amplitude", 0, NULL, 0);
-               uiItemR(col, &ptr, "phase_multiplier", 0, NULL, 0);
-               uiItemR(col, &ptr, "phase_offset", 0, NULL, 0);
-               uiItemR(col, &ptr, "value_offset", 0, NULL, 0);
+               uiItemR(col, &ptr, "amplitude", 0, NULL, ICON_NULL);
+               uiItemR(col, &ptr, "phase_multiplier", 0, NULL, ICON_NULL);
+               uiItemR(col, &ptr, "phase_offset", 0, NULL, ICON_NULL);
+               uiItemR(col, &ptr, "value_offset", 0, NULL, ICON_NULL);
 }
 
 /* --------------- */
@@ -253,15 +253,15 @@ static void draw_modifier__cycles(uiLayout *layout, ID *id, FModifier *fcm, shor
        
        /* before range */
        col= uiLayoutColumn(split, 1);
-               uiItemL(col, "Before:", 0);
-               uiItemR(col, &ptr, "mode_before", 0, "", 0);
-               uiItemR(col, &ptr, "cycles_before", 0, NULL, 0);
+               uiItemL(col, "Before:", ICON_NULL);
+               uiItemR(col, &ptr, "mode_before", 0, "", ICON_NULL);
+               uiItemR(col, &ptr, "cycles_before", 0, NULL, ICON_NULL);
                
        /* after range */
        col= uiLayoutColumn(split, 1);
-               uiItemL(col, "After:", 0);
-               uiItemR(col, &ptr, "mode_after", 0, "", 0);
-               uiItemR(col, &ptr, "cycles_after", 0, NULL, 0);
+               uiItemL(col, "After:", ICON_NULL);
+               uiItemR(col, &ptr, "mode_after", 0, "", ICON_NULL);
+               uiItemR(col, &ptr, "cycles_after", 0, NULL, ICON_NULL);
 }
 
 /* --------------- */
@@ -276,20 +276,20 @@ static void draw_modifier__noise(uiLayout *layout, ID *id, FModifier *fcm, short
        RNA_pointer_create(id, &RNA_FModifierNoise, fcm, &ptr);
        
        /* blending mode */
-       uiItemR(layout, &ptr, "blend_type", 0, NULL, 0);
+       uiItemR(layout, &ptr, "blend_type", 0, NULL, ICON_NULL);
        
        /* split into 2 columns */
        split= uiLayoutSplit(layout, 0.5f, 0);
        
        /* col 1 */
        col= uiLayoutColumn(split, 0);
-               uiItemR(col, &ptr, "scale", 0, NULL, 0);
-               uiItemR(col, &ptr, "strength", 0, NULL, 0);
+               uiItemR(col, &ptr, "scale", 0, NULL, ICON_NULL);
+               uiItemR(col, &ptr, "strength", 0, NULL, ICON_NULL);
        
        /* col 2 */
        col= uiLayoutColumn(split, 0);
-               uiItemR(col, &ptr, "phase", 0, NULL, 0);
-               uiItemR(col, &ptr, "depth", 0, NULL, 0);
+               uiItemR(col, &ptr, "phase", 0, NULL, ICON_NULL);
+               uiItemR(col, &ptr, "depth", 0, NULL, ICON_NULL);
 }
 
 /* --------------- */
@@ -469,12 +469,12 @@ static void draw_modifier__envelope(uiLayout *layout, ID *id, FModifier *fcm, sh
        
        /* general settings */
        col= uiLayoutColumn(layout, 1);
-               uiItemL(col, "Envelope:", 0);
-               uiItemR(col, &ptr, "reference_value", 0, NULL, 0);
+               uiItemL(col, "Envelope:", ICON_NULL);
+               uiItemR(col, &ptr, "reference_value", 0, NULL, ICON_NULL);
                
                row= uiLayoutRow(col, 1);
-                       uiItemR(row, &ptr, "default_min", 0, "Min", 0);
-                       uiItemR(row, &ptr, "default_max", 0, "Max", 0);
+                       uiItemR(row, &ptr, "default_min", 0, "Min", ICON_NULL);
+                       uiItemR(row, &ptr, "default_max", 0, "Max", ICON_NULL);
                        
        /* control points header */
        // TODO: move this control-point control stuff to using the new special widgets for lists
@@ -526,13 +526,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
                
                /* x-minimum */
                col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_min_x", 0, NULL, 0);
-                       uiItemR(col, &ptr, "min_x", 0, NULL, 0);
+                       uiItemR(col, &ptr, "use_min_x", 0, NULL, ICON_NULL);
+                       uiItemR(col, &ptr, "min_x", 0, NULL, ICON_NULL);
                        
                /* y-minimum*/
                col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_min_y", 0, NULL, 0);
-                       uiItemR(col, &ptr, "min_y", 0, NULL, 0);
+                       uiItemR(col, &ptr, "use_min_y", 0, NULL, ICON_NULL);
+                       uiItemR(col, &ptr, "min_y", 0, NULL, ICON_NULL);
        }
        
        /* row 2: maximum */
@@ -544,13 +544,13 @@ static void draw_modifier__limits(uiLayout *layout, ID *id, FModifier *fcm, shor
                
                /* x-minimum */
                col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_max_x", 0, NULL, 0);
-                       uiItemR(col, &ptr, "max_x", 0, NULL, 0);
+                       uiItemR(col, &ptr, "use_max_x", 0, NULL, ICON_NULL);
+                       uiItemR(col, &ptr, "max_x", 0, NULL, ICON_NULL);
                        
                /* y-minimum*/
                col= uiLayoutColumn(split, 1);
-                       uiItemR(col, &ptr, "use_max_y", 0, NULL, 0);
-                       uiItemR(col, &ptr, "max_y", 0, NULL, 0);
+                       uiItemR(col, &ptr, "use_max_y", 0, NULL, ICON_NULL);
+                       uiItemR(col, &ptr, "max_y", 0, NULL, ICON_NULL);
        }
 }
 
@@ -567,24 +567,24 @@ static void draw_modifier__stepped(uiLayout *layout, ID *id, FModifier *fcm, sho
        
        /* block 1: "stepping" settings */
        col= uiLayoutColumn(layout, 0);
-               uiItemR(col, &ptr, "frame_step", 0, NULL, 0);
-               uiItemR(col, &ptr, "frame_offset", 0, NULL, 0);
+               uiItemR(col, &ptr, "frame_step", 0, NULL, ICON_NULL);
+               uiItemR(col, &ptr, "frame_offset", 0, NULL, ICON_NULL);
                
        /* block 2: start range settings */
        col= uiLayoutColumn(layout, 1);
-               uiItemR(col, &ptr, "use_frame_start", 0, NULL, 0);
+               uiItemR(col, &ptr, "use_frame_start", 0, NULL, ICON_NULL);
                
                subcol = uiLayoutColumn(col, 1);
                uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_frame_start"));
-                       uiItemR(subcol, &ptr, "frame_start", 0, NULL, 0);
+                       uiItemR(subcol, &ptr, "frame_start", 0, NULL, ICON_NULL);
                        
        /* block 3: end range settings */
        col= uiLayoutColumn(layout, 1);
-               uiItemR(col, &ptr, "use_frame_end", 0, NULL, 0);
+               uiItemR(col, &ptr, "use_frame_end", 0, NULL, ICON_NULL);
                
                subcol = uiLayoutColumn(col, 1);
                uiLayoutSetActive(subcol, RNA_boolean_get(&ptr, "use_frame_end"));
-                       uiItemR(subcol, &ptr, "frame_end", 0, NULL, 0);
+                       uiItemR(subcol, &ptr, "frame_end", 0, NULL, ICON_NULL);
 }
 
 /* --------------- */
@@ -616,16 +616,16 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie
                uiBlockSetEmboss(block, UI_EMBOSSN);
                
                /* expand */
-               uiItemR(subrow, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(subrow, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                
                /* checkbox for 'active' status (for now) */
-               uiItemR(subrow, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(subrow, &ptr, "active", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                
                /* name */
                if (fmi)
-                       uiItemL(subrow, fmi->name, 0);
+                       uiItemL(subrow, fmi->name, ICON_NULL);
                else
-                       uiItemL(subrow, "<Unknown Modifier>", 0);
+                       uiItemL(subrow, "<Unknown Modifier>", ICON_NULL);
                
                /* right-align ------------------------------------------- */
                subrow= uiLayoutRow(row, 0);
@@ -633,7 +633,7 @@ void ANIM_uiTemplate_fmodifier_draw (uiLayout *layout, ID *id, ListBase *modifie
                
                
                /* 'mute' button */
-               uiItemR(subrow, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(subrow, &ptr, "mute", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                
                uiBlockSetEmboss(block, UI_EMBOSSN);
                
index 61cf17a..d0e7d8b 100644 (file)
@@ -700,14 +700,14 @@ void ANIM_keying_sets_menu_setup (bContext *C, const char title[], const char op
        uiLayout *layout;
        int i = 0;
        
-       pup= uiPupMenuBegin(C, title, 0);
+       pup= uiPupMenuBegin(C, title, ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        /* active Keying Set 
         *      - only include entry if it exists
         */
        if (scene->active_keyingset) {
-               uiItemIntO(layout, "Active Keying Set", 0, op_name, "type", i++);
+               uiItemIntO(layout, "Active Keying Set", ICON_NULL, op_name, "type", i++);
                uiItemS(layout);
        }
        else
@@ -719,7 +719,7 @@ void ANIM_keying_sets_menu_setup (bContext *C, const char title[], const char op
        if (scene->keyingsets.first) {
                for (ks= scene->keyingsets.first; ks; ks= ks->next) {
                        if (ANIM_keyingset_context_ok_poll(C, ks))
-                               uiItemIntO(layout, ks->name, 0, op_name, "type", i++);
+                               uiItemIntO(layout, ks->name, ICON_NULL, op_name, "type", i++);
                }
                uiItemS(layout);
        }
@@ -729,7 +729,7 @@ void ANIM_keying_sets_menu_setup (bContext *C, const char title[], const char op
        for (ks= builtin_keyingsets.first; ks; ks= ks->next) {
                /* only show KeyingSet if context is suitable */
                if (ANIM_keyingset_context_ok_poll(C, ks))
-                       uiItemIntO(layout, ks->name, 0, op_name, "type", i--);
+                       uiItemIntO(layout, ks->name, ICON_NULL, op_name, "type", i--);
        }
        
        uiPupMenuEnd(C, pup);
index d9f2a9f..829a1d7 100644 (file)
@@ -3946,7 +3946,7 @@ static int armature_parent_set_exec(bContext *C, wmOperator *op)
 static int armature_parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event))
 {
        EditBone *actbone = CTX_data_active_bone(C);
-       uiPopupMenu *pup= uiPupMenuBegin(C, "Make Parent ", 0);
+       uiPopupMenu *pup= uiPupMenuBegin(C, "Make Parent ", ICON_NULL);
        uiLayout *layout= uiPupMenuLayout(pup);
        int allchildbones = 0;
        
index e143425..71b6be4 100644 (file)
@@ -304,17 +304,17 @@ static int poselib_add_menu_invoke (bContext *C, wmOperator *op, wmEvent *UNUSED
                return OPERATOR_CANCELLED;
        
        /* start building */
-       pup= uiPupMenuBegin(C, op->type->name, 0);
+       pup= uiPupMenuBegin(C, op->type->name, ICON_NULL);
        layout= uiPupMenuLayout(pup);
        uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
        
        /* add new (adds to the first unoccupied frame) */
-       uiItemIntO(layout, "Add New", 0, "POSELIB_OT_pose_add", "frame", poselib_get_free_index(ob->poselib));
+       uiItemIntO(layout, "Add New", ICON_NULL, "POSELIB_OT_pose_add", "frame", poselib_get_free_index(ob->poselib));
        
        /* check if we have any choices to add a new pose in any other way */
        if ((ob->poselib) && (ob->poselib->markers.first)) {
                /* add new (on current frame) */
-               uiItemIntO(layout, "Add New (Current Frame)", 0, "POSELIB_OT_pose_add", "frame", CFRA);
+               uiItemIntO(layout, "Add New (Current Frame)", ICON_NULL, "POSELIB_OT_pose_add", "frame", CFRA);
                
                /* replace existing - submenu */
                uiItemMenuF(layout, "Replace Existing...", 0, poselib_add_menu_invoke__replacemenu, NULL);
index a985b3b..2db9b43 100644 (file)
@@ -1204,20 +1204,20 @@ static int pose_groups_menu_invoke (bContext *C, wmOperator *op, wmEvent *UNUSED
        /* if there's no active group (or active is invalid), create a new menu to find it */
        if (pose->active_group <= 0) {
                /* create a new menu, and start populating it with group names */
-               pup= uiPupMenuBegin(C, op->type->name, 0);
+               pup= uiPupMenuBegin(C, op->type->name, ICON_NULL);
                layout= uiPupMenuLayout(pup);
                
                /* special entry - allow to create new group, then use that 
                 *      (not to be used for removing though)
                 */
                if (strstr(op->idname, "assign")) {
-                       uiItemIntO(layout, "New Group", 0, op->idname, "type", 0);
+                       uiItemIntO(layout, "New Group", ICON_NULL, op->idname, "type", 0);
                        uiItemS(layout);
                }
                
                /* add entries for each group */
                for (grp= pose->agroups.first, i=1; grp; grp=grp->next, i++)
-                       uiItemIntO(layout, grp->name, 0, op->idname, "type", i);
+                       uiItemIntO(layout, grp->name, ICON_NULL, op->idname, "type", i);
                        
                /* finish building the menu, and process it (should result in calling self again) */
                uiPupMenuEnd(C, pup);
index d24eb2e..3dbf71b 100644 (file)
@@ -4775,7 +4775,7 @@ static int toggle_cyclic_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
        for(nu= editnurb->first; nu; nu= nu->next) {
                if(nu->pntsu>1 || nu->pntsv>1) {
                        if(nu->type==CU_NURBS) {
-                               pup= uiPupMenuBegin(C, "Direction", 0);
+                               pup= uiPupMenuBegin(C, "Direction", ICON_NULL);
                                layout= uiPupMenuLayout(pup);
                                uiItemsEnumO(layout, op->type->idname, "direction");
                                uiPupMenuEnd(C, pup);
@@ -5867,14 +5867,14 @@ static int delete_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
        uiLayout *layout;
 
        if(obedit->type==OB_SURF) {
-               pup= uiPupMenuBegin(C, "Delete", 0);
+               pup= uiPupMenuBegin(C, "Delete", ICON_NULL);
                layout= uiPupMenuLayout(pup);
                uiItemEnumO(layout, op->type->idname, NULL, 0, "type", 0);
                uiItemEnumO(layout, op->type->idname, NULL, 0, "type", 2);
                uiPupMenuEnd(C, pup);
        }
        else {
-               pup= uiPupMenuBegin(C, "Delete", 0);
+               pup= uiPupMenuBegin(C, "Delete", ICON_NULL);
                layout= uiPupMenuLayout(pup);
                uiItemsEnumO(layout, op->type->idname, "type");
                uiPupMenuEnd(C, pup);
index f0b2f96..96bc425 100644 (file)
@@ -138,7 +138,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
                        sprintf(name, "%s (Hidden)", gpl->info);
                else
                        sprintf(name, "%s (Locked)", gpl->info);
-               uiItemL(subrow, name, 0);
+               uiItemL(subrow, name, ICON_NULL);
                        
                /* delete button (only if hidden but not locked!) */
                if ((gpl->flag & GP_LAYER_HIDE) & !(gpl->flag & GP_LAYER_LOCKED)) {
@@ -165,7 +165,7 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
                uiBlockSetEmboss(block, UI_EMBOSS);
                
                /* name */
-               uiItemR(subrow, &ptr, "info", 0, "", 0);
+               uiItemR(subrow, &ptr, "info", 0, "", ICON_NULL);
                
                /* delete 'button' */
                uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -189,17 +189,17 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
                
                /* color */
                subcol= uiLayoutColumn(col, 1);
-                       uiItemR(subcol, &ptr, "color", 0, "", 0);
-                       uiItemR(subcol, &ptr, "alpha", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(subcol, &ptr, "color", 0, "", ICON_NULL);
+                       uiItemR(subcol, &ptr, "alpha", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                        
                /* stroke thickness */
                subcol= uiLayoutColumn(col, 1);
-                       uiItemR(subcol, &ptr, "line_width", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(subcol, &ptr, "line_width", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                
                /* debugging options */
                if (G.f & G_DEBUG) {
                        subcol= uiLayoutColumn(col, 1);
-                               uiItemR(subcol, &ptr, "show_points", 0, NULL, 0);
+                               uiItemR(subcol, &ptr, "show_points", 0, NULL, ICON_NULL);
                }
                
                /* right column ................... */
@@ -207,8 +207,8 @@ static void gp_drawui_layer (uiLayout *layout, bGPdata *gpd, bGPDlayer *gpl)
                
                /* onion-skinning */
                subcol= uiLayoutColumn(col, 1);
-                       uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", 0);
-                       uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", 0); // XXX shorter name here? i.e. GStep
+                       uiItemR(subcol, &ptr, "use_onion_skinning", 0, "Onion Skinning", ICON_NULL);
+                       uiItemR(subcol, &ptr, "ghost_range_max", 0, "Frames", ICON_NULL); // XXX shorter name here? i.e. GStep
                
        }
 } 
@@ -238,10 +238,10 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
                uiTemplateID(col, C, ctx_ptr, "grease_pencil", "GPENCIL_OT_data_add", NULL, "GPENCIL_OT_data_unlink"); 
                
                /* add new layer button - can be used even when no data, since it can add a new block too */
-               uiItemO(col, "New Layer", 0, "GPENCIL_OT_layer_add");
+               uiItemO(col, "New Layer", ICON_NULL, "GPENCIL_OT_layer_add");
                row= uiLayoutRow(col, 1);
-               uiItemO(row, "Delete Frame", 0, "GPENCIL_OT_active_frame_delete");
-               uiItemO(row, "Convert", 0, "GPENCIL_OT_convert");
+               uiItemO(row, "Delete Frame", ICON_NULL, "GPENCIL_OT_active_frame_delete");
+               uiItemO(row, "Convert", ICON_NULL, "GPENCIL_OT_convert");
                
        /* sanity checks... */
        if (gpd == NULL)
@@ -256,7 +256,7 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
        /* draw gpd drawing settings first ------------------------------------- */
        col= uiLayoutColumn(layout, 1);
                /* label */
-               uiItemL(col, "Drawing Settings:", 0);
+               uiItemL(col, "Drawing Settings:", ICON_NULL);
                
                /* check whether advanced 3D-View drawing space options can be used */
                if (CTX_wm_view3d(C)) {
@@ -268,16 +268,16 @@ static void draw_gpencil_panel (bContext *C, uiLayout *layout, bGPdata *gpd, Poi
                
                /* drawing space options */
                row= uiLayoutRow(col, 1);
-                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, 0);
-                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL, 0);
+                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "VIEW", NULL, ICON_NULL);
+                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "CURSOR", NULL, ICON_NULL);
                row= uiLayoutRow(col, 1);
                        uiLayoutSetActive(row, v3d_stroke_opts);
-                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, 0);
-                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, 0);
+                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "SURFACE", NULL, ICON_NULL);
+                       uiItemEnumR_string(row, &gpd_ptr, "draw_mode", "STROKE", NULL, ICON_NULL);
                
                row= uiLayoutRow(col, 0);
                        uiLayoutSetActive(row, v3d_stroke_opts==STROKE_OPTS_V3D_ON);
-                       uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, 0);
+                       uiItemR(row, &gpd_ptr, "use_stroke_endpoints", 0, NULL, ICON_NULL);
 }      
 
 
index bab5fef..fc8e0ca 100644 (file)
@@ -637,6 +637,9 @@ void UI_exit(void);
 #define UI_LAYOUT_OP_SHOW_TITLE 1
 #define UI_LAYOUT_OP_SHOW_EMPTY 2
 
+/* for more readable function names */
+#define ICON_NULL 0
+
 uiLayout *uiBlockLayout(uiBlock *block, int dir, int type, int x, int y, int size, int em, struct uiStyle *style);
 void uiBlockSetCurLayout(uiBlock *block, uiLayout *layout);
 void uiBlockLayoutResolve(uiBlock *block, int *x, int *y);
index 1f701ca..4c35b3c 100644 (file)
@@ -4022,7 +4022,7 @@ static uiBlock *menu_change_shortcut(bContext *C, ARegion *ar, void *arg)
        
        layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 200, 20, style);
        
-       uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE, "", 0);
+       uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE, "", ICON_NULL);
        
        uiPopupBoundsBlock(block, 6, -50, 26);
        uiEndBlock(C, block);
@@ -4060,7 +4060,7 @@ static uiBlock *menu_add_shortcut(bContext *C, ARegion *ar, void *arg)
 
        layout= uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, 0, 0, 200, 20, style);
 
-       uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE, "", 0);
+       uiItemR(layout, &ptr, "type", UI_ITEM_R_FULL_EVENT|UI_ITEM_R_IMMEDIATE, "", ICON_NULL);
        
        uiPopupBoundsBlock(block, 6, -50, 26);
        uiEndBlock(C, block);
@@ -4116,7 +4116,7 @@ static int ui_but_menu(bContext *C, uiBut *but)
        else
                name= "<needs_name>"; // XXX - should never happen.
 
-       pup= uiPupMenuBegin(C, name, 0);
+       pup= uiPupMenuBegin(C, name, ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        uiLayoutSetOperatorContext(layout, WM_OP_INVOKE_DEFAULT);
@@ -4133,24 +4133,24 @@ static int ui_but_menu(bContext *C, uiBut *but)
                /* Keyframes */
                if(but->flag & UI_BUT_ANIMATED_KEY) {
                        if(length) {
-                               uiItemBooleanO(layout, "Replace Keyframes", 0, "ANIM_OT_keyframe_insert_button", "all", 1);
-                               uiItemBooleanO(layout, "Replace Single Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0);
-                               uiItemBooleanO(layout, "Delete Keyframes", 0, "ANIM_OT_keyframe_delete_button", "all", 1);
-                               uiItemBooleanO(layout, "Delete Single Keyframe", 0, "ANIM_OT_keyframe_delete_button", "all", 0);
+                               uiItemBooleanO(layout, "Replace Keyframes", ICON_NULL, "ANIM_OT_keyframe_insert_button", "all", 1);
+                               uiItemBooleanO(layout, "Replace Single Keyframe", ICON_NULL, "ANIM_OT_keyframe_insert_button", "all", 0);
+                               uiItemBooleanO(layout, "Delete Keyframes", ICON_NULL, "ANIM_OT_keyframe_delete_button", "all", 1);
+                               uiItemBooleanO(layout, "Delete Single Keyframe", ICON_NULL, "ANIM_OT_keyframe_delete_button", "all", 0);
                        }
                        else {
-                               uiItemBooleanO(layout, "Replace Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0);
-                               uiItemBooleanO(layout, "Delete Keyframe", 0, "ANIM_OT_keyframe_delete_button", "all", 0);
+                               uiItemBooleanO(layout, "Replace Keyframe", ICON_NULL, "ANIM_OT_keyframe_insert_button", "all", 0);
+                               uiItemBooleanO(layout, "Delete Keyframe", ICON_NULL, "ANIM_OT_keyframe_delete_button", "all", 0);
                        }
                }
                else if(but->flag & UI_BUT_DRIVEN);
                else if(is_anim) {
                        if(length) {
-                               uiItemBooleanO(layout, "Insert Keyframes", 0, "ANIM_OT_keyframe_insert_button", "all", 1);
-                               uiItemBooleanO(layout, "Insert Single Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0);
+                               uiItemBooleanO(layout, "Insert Keyframes", ICON_NULL, "ANIM_OT_keyframe_insert_button", "all", 1);
+                               uiItemBooleanO(layout, "Insert Single Keyframe", ICON_NULL, "ANIM_OT_keyframe_insert_button", "all", 0);
                        }
                        else
-                               uiItemBooleanO(layout, "Insert Keyframe", 0, "ANIM_OT_keyframe_insert_button", "all", 0);
+                               uiItemBooleanO(layout, "Insert Keyframe", ICON_NULL, "ANIM_OT_keyframe_insert_button", "all", 0);
                }
                
                /* Drivers */
@@ -4158,29 +4158,29 @@ static int ui_but_menu(bContext *C, uiBut *but)
                        uiItemS(layout);
 
                        if(length) {
-                               uiItemBooleanO(layout, "Delete Drivers", 0, "ANIM_OT_driver_button_remove", "all", 1);
-                               uiItemBooleanO(layout, "Delete Single Driver", 0, "ANIM_OT_driver_button_remove", "all", 0);
+                               uiItemBooleanO(layout, "Delete Drivers", ICON_NULL, "ANIM_OT_driver_button_remove", "all", 1);
+                               uiItemBooleanO(layout, "Delete Single Driver", ICON_NULL, "ANIM_OT_driver_button_remove", "all", 0);
                        }
                        else
-                               uiItemBooleanO(layout, "Delete Driver", 0, "ANIM_OT_driver_button_remove", "all", 0);
+                               uiItemBooleanO(layout, "Delete Driver", ICON_NULL, "ANIM_OT_driver_button_remove", "all", 0);
 
-                       uiItemO(layout, "Copy Driver", 0, "ANIM_OT_copy_driver_button");
+                       uiItemO(layout, "Copy Driver", ICON_NULL, "ANIM_OT_copy_driver_button");
                        if (ANIM_driver_can_paste())
-                               uiItemO(layout, "Paste Driver", 0, "ANIM_OT_paste_driver_button");
+                               uiItemO(layout, "Paste Driver", ICON_NULL, "ANIM_OT_paste_driver_button");
                }
                else if(but->flag & (UI_BUT_ANIMATED_KEY|UI_BUT_ANIMATED));
                else if(is_anim) {
                        uiItemS(layout);
 
                        if(length) {
-                               uiItemBooleanO(layout, "Add Drivers", 0, "ANIM_OT_driver_button_add", "all", 1);
-                               uiItemBooleanO(layout, "Add Single Driver", 0, "ANIM_OT_driver_button_add", "all", 0);
+                               uiItemBooleanO(layout, "Add Drivers", ICON_NULL, "ANIM_OT_driver_button_add", "all", 1);
+                               uiItemBooleanO(layout, "Add Single Driver", ICON_NULL, "ANIM_OT_driver_button_add", "all", 0);
                        }
                        else
-                               uiItemBooleanO(layout, "Add Driver", 0, "ANIM_OT_driver_button_add", "all", 0);
+                               uiItemBooleanO(layout, "Add Driver", ICON_NULL, "ANIM_OT_driver_button_add", "all", 0);
 
                        if (ANIM_driver_can_paste())
-                               uiItemO(layout, "Paste Driver", 0, "ANIM_OT_paste_driver_button");
+                               uiItemO(layout, "Paste Driver", ICON_NULL, "ANIM_OT_paste_driver_button");
                }
                
                /* Keying Sets */
@@ -4188,13 +4188,13 @@ static int ui_but_menu(bContext *C, uiBut *but)
                        uiItemS(layout);
 
                        if(length) {
-                               uiItemBooleanO(layout, "Add All to Keying Set", 0, "ANIM_OT_keyingset_button_add", "all", 1);
-                               uiItemBooleanO(layout, "Add Single to Keying Set", 0, "ANIM_OT_keyingset_button_add", "all", 0);
-                               uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_keyingset_button_remove");
+                               uiItemBooleanO(layout, "Add All to Keying Set", ICON_NULL, "ANIM_OT_keyingset_button_add", "all", 1);
+                               uiItemBooleanO(layout, "Add Single to Keying Set", ICON_NULL, "ANIM_OT_keyingset_button_add", "all", 0);
+                               uiItemO(layout, "Remove from Keying Set", ICON_NULL, "ANIM_OT_keyingset_button_remove");
                        }
                        else {
-                               uiItemBooleanO(layout, "Add to Keying Set", 0, "ANIM_OT_keyingset_button_add", "all", 0);
-                               uiItemO(layout, "Remove from Keying Set", 0, "ANIM_OT_keyingset_button_remove");
+                               uiItemBooleanO(layout, "Add to Keying Set", ICON_NULL, "ANIM_OT_keyingset_button_add", "all", 0);
+                               uiItemO(layout, "Remove from Keying Set", ICON_NULL, "ANIM_OT_keyingset_button_remove");
                        }
                }
                
@@ -4206,14 +4206,14 @@ static int ui_but_menu(bContext *C, uiBut *but)
                //Paste Property Value
                
                if(length) {
-                       uiItemBooleanO(layout, "Reset All to Default Values", 0, "UI_OT_reset_default_button", "all", 1);
-                       uiItemBooleanO(layout, "Reset Single to Default Value", 0, "UI_OT_reset_default_button", "all", 0);
+                       uiItemBooleanO(layout, "Reset All to Default Values", ICON_NULL, "UI_OT_reset_default_button", "all", 1);
+                       uiItemBooleanO(layout, "Reset Single to Default Value", ICON_NULL, "UI_OT_reset_default_button", "all", 0);
                }
                else
-                       uiItemO(layout, "Reset to Default Value", 0, "UI_OT_reset_default_button");
+                       uiItemO(layout, "Reset to Default Value", ICON_NULL, "UI_OT_reset_default_button");
                
-               uiItemO(layout, "Copy Data Path", 0, "UI_OT_copy_data_path_button");
-               uiItemO(layout, "Copy To Selected", 0, "UI_OT_copy_to_selected_button");
+               uiItemO(layout, "Copy Data Path", ICON_NULL, "UI_OT_copy_data_path_button");
+               uiItemO(layout, "Copy To Selected", ICON_NULL, "UI_OT_copy_to_selected_button");
 
                uiItemS(layout);
        }
@@ -4262,28 +4262,28 @@ static int ui_but_menu(bContext *C, uiBut *but)
 
                        WM_operator_properties_create(&ptr_props, "WM_OT_doc_view");
                        RNA_string_set(&ptr_props, "doc_id", buf);
-                       uiItemFullO(layout, "WM_OT_doc_view", "View Docs", 0, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
+                       uiItemFullO(layout, "WM_OT_doc_view", "View Docs", ICON_NULL, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
 
 
                        WM_operator_properties_create(&ptr_props, "WM_OT_doc_edit");
                        RNA_string_set(&ptr_props, "doc_id", buf);
                        RNA_string_set(&ptr_props, "doc_new", RNA_property_description(but->rnaprop));
 
-                       uiItemFullO(layout, "WM_OT_doc_edit", "Submit Description", 0, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
+                       uiItemFullO(layout, "WM_OT_doc_edit", "Submit Description", ICON_NULL, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
                }
                else if (but->optype) {
                        WM_operator_py_idname(buf, but->optype->idname);
 
                        WM_operator_properties_create(&ptr_props, "WM_OT_doc_view");
                        RNA_string_set(&ptr_props, "doc_id", buf);
-                       uiItemFullO(layout, "WM_OT_doc_view", "View Docs", 0, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
+                       uiItemFullO(layout, "WM_OT_doc_view", "View Docs", ICON_NULL, ptr_props.data, WM_OP_EXEC_DEFAULT, 0);
 
 
                        WM_operator_properties_create(&ptr_props, "WM_OT_doc_edit");
                        RNA_string_set(&ptr_props, "doc_id", buf);
                        RNA_string_set(&ptr_props, "doc_new", but->optype->description);
 
-                       uiItemFullO(layout, "WM_OT_doc_edit", "Submit Description", 0, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
+                       uiItemFullO(layout, "WM_OT_doc_edit", "Submit Description", ICON_NULL, ptr_props.data, WM_OP_INVOKE_DEFAULT, 0);
                }
        }
 
index 566400e..b0ab902 100644 (file)
@@ -748,7 +748,7 @@ int UI_icon_get_width(int icon_id)
 
        icon = BKE_icon_get(icon_id);
        
-       if (!icon) {
+       if (icon==ICON_NULL) {
                if (G.f & G_DEBUG)
                        printf("UI_icon_get_width: Internal error, no icon for icon ID: %d\n", icon_id);
                return 0;
@@ -773,7 +773,7 @@ int UI_icon_get_height(int icon_id)
 
        icon = BKE_icon_get(icon_id);
        
-       if (!icon) {
+       if (icon==ICON_NULL) {
                if (G.f & G_DEBUG)
                        printf("UI_icon_get_height: Internal error, no icon for icon ID: %d\n", icon_id);
                return 0;
@@ -949,7 +949,7 @@ static void icon_draw_size(float x, float y, int icon_id, float aspect, float al
        
        icon = BKE_icon_get(icon_id);
        
-       if (!icon) {
+       if (icon==ICON_NULL) {
                if (G.f & G_DEBUG)
                        printf("icon_draw_mipmap: Internal error, no icon for icon ID: %d\n", icon_id);
                return;
index a419fcf..5590157 100644 (file)
@@ -406,14 +406,14 @@ static void ui_item_array(uiLayout *layout, uiBlock *block, const char *name, in
                        col= a % dim_size[0];
                        row= a / dim_size[0];
                        
-                       but= uiDefAutoButR(block, ptr, prop, a, "", 0, x + w*col, y+(dim_size[1]*UI_UNIT_Y)-(row*UI_UNIT_Y), w, UI_UNIT_Y);
+                       but= uiDefAutoButR(block, ptr, prop, a, "", ICON_NULL, x + w*col, y+(dim_size[1]*UI_UNIT_Y)-(row*UI_UNIT_Y), w, UI_UNIT_Y);
                        if(slider && but->type==NUM)
                                but->type= NUMSLI;
                }
        }
        else {
                if(ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA) && !expand)
-                       uiDefAutoButR(block, ptr, prop, -1, "", 0, 0, 0, w, UI_UNIT_Y);
+                       uiDefAutoButR(block, ptr, prop, -1, "", ICON_NULL, 0, 0, w, UI_UNIT_Y);
 
                if(!ELEM(subtype, PROP_COLOR, PROP_COLOR_GAMMA) || expand) {
                        /* layout for known array subtypes */
@@ -752,7 +752,7 @@ void uiItemsFullEnumO(uiLayout *layout, const char *opname, const char *propname
                                                block->flag |= UI_BLOCK_NO_FLIP;
                                        }
 
-                                       uiItemL(column, (char*)item[i].name, 0);
+                                       uiItemL(column, (char*)item[i].name, ICON_NULL);
                                        bt= block->buttons.last;
                                        bt->flag= UI_TEXT_LEFT;
                                }
@@ -877,7 +877,7 @@ static void ui_item_rna_size(uiLayout *layout, const char *name, int icon, Point
 
        /* increase height for arrays */
        if(index == RNA_NO_INDEX && len > 0) {
-               if(!name[0] && icon == 0)
+               if(!name[0] && icon == ICON_NULL)
                        h= 0;
 
                if(ELEM(subtype, PROP_LAYER, PROP_LAYER_MEMBER))
@@ -917,7 +917,7 @@ void uiItemFullR(uiLayout *layout, PointerRNA *ptr, PropertyRNA *prop, int index
        /* set name and icon */
        if(!name)
                name= (char*)RNA_property_ui_name(prop);
-       if(!icon)
+       if(icon == ICON_NULL)
                icon= RNA_property_ui_icon(prop);
        
        if(ELEM4(type, PROP_INT, PROP_FLOAT, PROP_STRING, PROP_POINTER))
@@ -1077,7 +1077,7 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname
 
                for(i=0; i<totitem; i++) {
                        if(item[i].identifier[0]) {
-                               uiItemEnumR(column, (char*)item[i].name, 0, ptr, propname, item[i].value);
+                               uiItemEnumR(column, (char*)item[i].name, ICON_NULL, ptr, propname, item[i].value);
                        }
                        else {
                                if(item[i].name) {
@@ -1087,7 +1087,7 @@ void uiItemsEnumR(uiLayout *layout, struct PointerRNA *ptr, const char *propname
                                                block->flag |= UI_BLOCK_NO_FLIP;
                                        }
 
-                                       uiItemL(column, (char*)item[i].name, 0);
+                                       uiItemL(column, (char*)item[i].name, ICON_NULL);
                                        bt= block->buttons.last;
                                        bt->flag= UI_TEXT_LEFT;
                                }
@@ -1264,13 +1264,18 @@ void uiItemPointerR(uiLayout *layout, struct PointerRNA *ptr, const char *propna
 
        searchprop= RNA_struct_find_property(searchptr, searchpropname);
 
-       if(!searchprop || RNA_property_type(searchprop) != PROP_COLLECTION) {
+
+       if(!searchprop) {
                printf("uiItemPointerR: search collection property not found: %s.%s\n", RNA_struct_identifier(ptr->type), searchpropname);
                return;
        }
+       else if (RNA_property_type(searchprop) != PROP_COLLECTION) {
+               printf("uiItemPointerR: search collection property is not a collection type: %s.%s\n", RNA_struct_identifier(ptr->type), searchpropname);
+               return;
+       }
 
        /* get icon & name */
-       if(!icon) {
+       if(icon==ICON_NULL) {
                if(type == PROP_POINTER)
                        icontype= RNA_property_pointer_type(ptr, prop);
                else
@@ -2674,14 +2679,14 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in
        }
 
        if(flag & UI_LAYOUT_OP_SHOW_TITLE) {
-               uiItemL(layout, op->type->name, 0);
+               uiItemL(layout, op->type->name, ICON_NULL);
        }
 
        /* poll() on this operator may still fail, at the moment there is no nice feedback when this happens
         * just fails silently */
        if(!WM_operator_repeat_check(C, op)) {
                uiBlockSetButLock(uiLayoutGetBlock(layout), TRUE, "Operator cannot redo");
-               uiItemL(layout, "* Redo Unsupported *", 0); // XXX, could give some nicer feedback or not show redo panel at all?
+               uiItemL(layout, "* Redo Unsupported *", ICON_NULL); // XXX, could give some nicer feedback or not show redo panel at all?
        }
 
        if(op->type->ui) {
@@ -2702,7 +2707,7 @@ void uiLayoutOperatorButs(const bContext *C, uiLayout *layout, wmOperator *op,in
                empty= uiDefAutoButsRNA(layout, &ptr, check_prop, label_align) == 0;
 
                if(empty && (flag & UI_LAYOUT_OP_SHOW_EMPTY)) {
-                       uiItemL(layout, "No Properties.", 0);
+                       uiItemL(layout, "No Properties.", ICON_NULL);
                }
        }
 }
index 2230042..d22106f 100644 (file)
@@ -1487,7 +1487,7 @@ static void ui_block_func_MENUSTR(bContext *UNUSED(C), uiLayout *layout, void *a
                        uiItemL(layout, md->title, md->titleicon);
                }
                else {
-                       uiItemL(layout, md->title, 0);
+                       uiItemL(layout, md->title, ICON_NULL);
                        bt= block->buttons.last;
                        bt->flag= UI_TEXT_LEFT;
                }
@@ -1887,7 +1887,7 @@ static void uiBlockPicker(uiBlock *block, float *rgb, PointerRNA *ptr, PropertyR
        bt= uiDefButR(block, NUMSLI, 0, "B ",   0, -100, butwidth, UI_UNIT_Y, ptr, propname, 2, 0.0, 0.0, 0, 3, "Blue");
        uiButSetFunc(bt, do_picker_rna_cb, bt, NULL);
 
-       // could use uiItemFullR(col, ptr, prop, -1, 0, UI_ITEM_R_EXPAND|UI_ITEM_R_SLIDER, "", 0);
+       // could use uiItemFullR(col, ptr, prop, -1, 0, UI_ITEM_R_EXPAND|UI_ITEM_R_SLIDER, "", ICON_NULL);
        // but need to use uiButSetFunc for updating other fake buttons
        
        /* HSV values */
@@ -2411,7 +2411,7 @@ void uiPupMenuInvoke(bContext *C, const char *idname)
        if(mt->poll && mt->poll(C, mt)==0)
                return;
 
-       pup= uiPupMenuBegin(C, mt->label, 0);
+       pup= uiPupMenuBegin(C, mt->label, ICON_NULL);
        layout= uiPupMenuLayout(pup);
 
        menu.layout= layout;
index 3ac8682..0c917f2 100644 (file)
@@ -525,16 +525,16 @@ void uiTemplateAnyID(uiLayout *layout, PointerRNA *ptr, const char *propname, co
        
        /* Label - either use the provided text, or will become "ID-Block:" */
        if (text)
-               uiItemL(row, text, 0);
+               uiItemL(row, text, ICON_NULL);
        else
-               uiItemL(row, "ID-Block:", 0);
+               uiItemL(row, "ID-Block:", ICON_NULL);
        
        /* ID-Type Selector - just have a menu of icons */
        // FIXME: the icon-only setting doesn't work when we supply a blank name
-       uiItemFullR(row, ptr, propType, 0, 0, UI_ITEM_R_ICON_ONLY, "", 0);
+       uiItemFullR(row, ptr, propType, 0, 0, UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
        
        /* ID-Block Selector - just use pointer widget... */
-       uiItemFullR(row, ptr, propID, 0, 0, 0, "", 0);
+       uiItemFullR(row, ptr, propID, 0, 0, 0, "", ICON_NULL);
 }
 
 /********************* RNA Path Builder Template ********************/
@@ -679,14 +679,14 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                
                uiBlockSetEmboss(block, UI_EMBOSSN);
                /* Open/Close .................................  */
-               uiItemR(row, &ptr, "show_expanded", 0, "", 0);
+               uiItemR(row, &ptr, "show_expanded", 0, "", ICON_NULL);
                
                /* modifier-type icon */
                uiItemL(row, "", RNA_struct_ui_icon(ptr.type));
                uiBlockSetEmboss(block, UI_EMBOSS);
                
                /* modifier name */
-               uiItemR(row, &ptr, "name", 0, "", 0);
+               uiItemR(row, &ptr, "name", 0, "", ICON_NULL);
                
                /* mode enabling buttons */
                uiBlockBeginAlign(block);
@@ -694,11 +694,11 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                if ( ((md->type!=eModifierType_Softbody && md->type!=eModifierType_Collision) || !(ob->pd && ob->pd->deflect)) 
                        && (md->type!=eModifierType_Surface) ) 
                {
-                       uiItemR(row, &ptr, "show_render", 0, "", 0);
-                       uiItemR(row, &ptr, "show_viewport", 0, "", 0);
+                       uiItemR(row, &ptr, "show_render", 0, "", ICON_NULL);
+                       uiItemR(row, &ptr, "show_viewport", 0, "", ICON_NULL);
                        
                        if (mti->flags & eModifierTypeFlag_SupportsEditmode)
-                               uiItemR(row, &ptr, "show_in_editmode", 0, "", 0);
+                               uiItemR(row, &ptr, "show_in_editmode", 0, "", ICON_NULL);
                }
                if ((ob->type==OB_MESH) && modifier_couldBeCage(scene, md) && (index <= lastCageIndex)) 
                {
@@ -738,9 +738,9 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                                
                                if (!(ob->mode & OB_MODE_PARTICLE_EDIT) && psys->pathcache) {
                                        if(ELEM(psys->part->ren_as, PART_DRAW_GR, PART_DRAW_OB))
-                                               uiItemO(row, "Convert", 0, "OBJECT_OT_duplicates_make_real");
+                                               uiItemO(row, "Convert", ICON_NULL, "OBJECT_OT_duplicates_make_real");
                                        else if(psys->part->ren_as == PART_DRAW_PATH)
-                                               uiItemO(row, "Convert", 0, "OBJECT_OT_modifier_convert");
+                                               uiItemO(row, "Convert", ICON_NULL, "OBJECT_OT_modifier_convert");
                                }
                        }
                        else {
@@ -755,7 +755,7 @@ static uiLayout *draw_modifier(uiLayout *layout, Scene *scene, Object *ob, Modif
                        uiBlockSetButLock(block, ob && ob->id.lib, ERROR_LIBDATA_MESSAGE);
                        
                        if (!ELEM5(md->type, eModifierType_Fluidsim, eModifierType_Softbody, eModifierType_ParticleSystem, eModifierType_Cloth, eModifierType_Smoke))
-                               uiItemO(row, "Copy", 0, "OBJECT_OT_modifier_copy");
+                               uiItemO(row, "Copy", ICON_NULL, "OBJECT_OT_modifier_copy");
                }
                
                /* result is the layout block inside the box, that we return so that modifier settings can be drawn */
@@ -913,7 +913,7 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
 
        /* open/close */
        uiBlockSetEmboss(block, UI_EMBOSSN);
-       uiItemR(row, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", 0);
+       uiItemR(row, &ptr, "show_expanded", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
        uiBlockSetEmboss(block, UI_EMBOSS);
        
        /* name */
@@ -923,10 +923,10 @@ static uiLayout *draw_constraint(uiLayout *layout, Object *ob, bConstraint *con)
                uiLayoutSetRedAlert(row, 1);
        
        if(proxy_protected == 0) {
-               uiItemR(row, &ptr, "name", 0, "", 0);
+               uiItemR(row, &ptr, "name", 0, "", ICON_NULL);
        }
        else
-               uiItemL(row, con->name, 0);
+               uiItemL(row, con->name, ICON_NULL);
        
        uiLayoutSetRedAlert(row, 0);
        
@@ -1114,7 +1114,7 @@ void uiTemplatePreview(uiLayout *layout, ID *id, int show_buttons, ID *parent, M
 
                        col = uiLayoutColumn(row, 1);
                        uiLayoutSetScaleX(col, 1.5);
-                       uiItemR(col, &material_ptr, "preview_render_type", UI_ITEM_R_EXPAND, "", 0);
+                       uiItemR(col, &material_ptr, "preview_render_type", UI_ITEM_R_EXPAND, "", ICON_NULL);
                }
 
                if(pr_texture) {
@@ -1134,7 +1134,7 @@ void uiTemplatePreview(uiLayout *layout, ID *id, int show_buttons, ID *parent, M
                        /* Alpha buton for texture preview */
                        if(*pr_texture!=TEX_PR_OTHER) {
                                row = uiLayoutRow(layout, 0);
-                               uiItemR(row, &texture_ptr, "use_preview_alpha", 0, NULL, 0);
+                               uiItemR(row, &texture_ptr, "use_preview_alpha", 0, NULL, ICON_NULL);
                        }
                }
        }
@@ -1249,8 +1249,8 @@ static void colorband_buttons_large(uiLayout *layout, uiBlock *block, ColorBand
                PointerRNA ptr;
                RNA_pointer_create(cb->ptr.id.data, &RNA_ColorRampElement, cbd, &ptr);
                row= uiLayoutRow(layout, 0);
-               uiItemR(row, &ptr, "position", 0, "Pos", 0);
-               uiItemR(row, &ptr, "color", 0, "", 0);
+               uiItemR(row, &ptr, "position", 0, "Pos", ICON_NULL);
+               uiItemR(row, &ptr, "color", 0, "", ICON_NULL);
        }
 
 }
@@ -1274,7 +1274,7 @@ static void colorband_buttons_small(uiLayout *layout, uiBlock *block, ColorBand
                CBData *cbd= coba->data + coba->cur;
                PointerRNA ptr;
                RNA_pointer_create(cb->ptr.id.data, &RNA_ColorRampElement, cbd, &ptr);
-               uiItemR(layout, &ptr, "color", 0, "", 0);
+               uiItemR(layout, &ptr, "color", 0, "", ICON_NULL);
        }
 
        bt= uiDefButS(block, MENU, 0,           "Interpolation %t|Ease %x1|Cardinal %x3|Linear %x0|B-Spline %x2|Constant %x4",
@@ -1753,8 +1753,8 @@ static void curvemap_buttons_layout(uiLayout *layout, PointerRNA *ptr, char labe
        /* black/white levels */
        if(levels) {
                split= uiLayoutSplit(layout, 0, 0);
-               uiItemR(uiLayoutColumn(split, 0), ptr, "black_level", UI_ITEM_R_EXPAND, NULL, 0);
-               uiItemR(uiLayoutColumn(split, 0), ptr, "white_level", UI_ITEM_R_EXPAND, NULL, 0);
+               uiItemR(uiLayoutColumn(split, 0), ptr, "black_level", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
+               uiItemR(uiLayoutColumn(split, 0), ptr, "white_level", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
 
                uiLayoutRow(layout, 0);
                bt=uiDefBut(block, BUT, 0, "Reset",     0, 0, UI_UNIT_X*10, UI_UNIT_Y, NULL, 0.0f, 0.0f, 0, 0, "Reset Black/White point and curves");
@@ -1979,7 +1979,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 
        /* retrieve icon and name */
        icon= list_item_icon_get(C, itemptr, rnaicon);
-       if(!icon || icon == ICON_DOT)
+       if(icon == ICON_NULL || icon == ICON_DOT)
                icon= 0;
 
        namebuf= RNA_struct_name_get_alloc(itemptr, NULL, 0);
@@ -2020,7 +2020,7 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
                                uiItemL(sub, str, ui_id_icon_get(C, &manode->id, 1));
                        }
                        else if(ma->use_nodes) {
-                               uiItemL(sub, "Node <none>", 0);
+                               uiItemL(sub, "Node <none>", ICON_NULL);
                        }
                }
        }
@@ -2033,8 +2033,8 @@ static void list_item_row(bContext *C, uiLayout *layout, PointerRNA *ptr, Pointe
 
                uiBlockSetEmboss(block, UI_EMBOSSN);
                row= uiLayoutRow(split, 1);
-               if(i == 0) uiItemL(row, "", 0);
-               else uiItemR(row, itemptr, "value", 0, "", 0);
+               if(i == 0) uiItemL(row, "", ICON_NULL);
+               else uiItemR(row, itemptr, "value", 0, "", ICON_NULL);
 
                if(ob->mode == OB_MODE_EDIT && !((ob->shapeflag & OB_SHAPE_EDIT_MODE) && ob->type == OB_MESH))
                        uiLayoutSetActive(row, 0);
@@ -2161,7 +2161,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *
 
                /* if not found, add in dummy button */
                if(i == 0)
-                       uiItemL(row, "", 0);
+                       uiItemL(row, "", ICON_NULL);
 
                /* next/prev button */
                sprintf(str, "%d :", i);
@@ -2214,7 +2214,7 @@ void uiTemplateList(uiLayout *layout, bContext *C, PointerRNA *ptr, const char *
                /* add dummy buttons to fill space */
                while(i < pa->list_scroll+items) {
                        if(i >= pa->list_scroll)
-                               uiItemL(col, "", 0);
+                               uiItemL(col, "", ICON_NULL);
                        i++;
                }
 
index b42b5af..dbe3697 100644 (file)
@@ -151,12 +151,12 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Proper
 
                        if(label_align=='V') {
                                col= uiLayoutColumn(layout, 1);
-                               uiItemL(col, name, 0);
+                               uiItemL(col, name, ICON_NULL);
                        }
                        else if(label_align=='H') {
                                split = uiLayoutSplit(layout, 0.5f, 0);
 
-                               uiItemL(uiLayoutColumn(split, 0), name, 0);
+                               uiItemL(uiLayoutColumn(split, 0), name, ICON_NULL);
                                col= uiLayoutColumn(split, 0);
                        }
                        else {
@@ -177,7 +177,7 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Proper
                        name= NULL; /* no smart label alignment, show default name with button */
                }
 
-               uiItemFullR(col, ptr, prop, -1, 0, 0, name, 0);
+               uiItemFullR(col, ptr, prop, -1, 0, 0, name, ICON_NULL);
                tot++;
        }
        RNA_STRUCT_END;
@@ -194,7 +194,7 @@ int uiIconFromID(ID *id)
        short idcode;
 
        if(id==NULL)
-               return 0;
+               return ICON_NULL;
        
        idcode= GS(id->name);
 
@@ -212,5 +212,5 @@ int uiIconFromID(ID *id)
           will set the right type, also with subclassing */
        RNA_id_pointer_create(id, &ptr);
 
-       return (ptr.type)? RNA_struct_ui_icon(ptr.type): 0;
+       return (ptr.type)? RNA_struct_ui_icon(ptr.type) : ICON_NULL;
 }
index 1d49735..efdb2ef 100644 (file)
@@ -749,7 +749,7 @@ static void widget_draw_preview(BIFIconID icon, float aspect, float UNUSED(alpha
 {
        int w, h, x, y, size;
 
-       if(!icon)
+       if(icon==ICON_NULL)
                return;
 
        w = rect->xmax - rect->xmin;
index 431fbf1..fdf46ea 100644 (file)
@@ -530,7 +530,7 @@ static int object_metaball_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUS
 
        object_add_generic_invoke_options(C, op);
 
-       pup= uiPupMenuBegin(C, op->type->name, 0);
+       pup= uiPupMenuBegin(C, op->type->name, ICON_NULL);
        layout= uiPupMenuLayout(pup);
        if(!obedit || obedit->type == OB_MBALL)
                uiItemsEnumO(layout, op->type->idname, "type");
index 50088e4..f856ab7 100644 (file)
@@ -1506,7 +1506,7 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(evt))
        }
        
        /* prepare popup menu to choose targetting options */
-       pup= uiPupMenuBegin(C, "Add IK", 0);
+       pup= uiPupMenuBegin(C, "Add IK", ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        /* the type of targets we'll set determines the menu entries to show... */
@@ -1515,14 +1515,14 @@ static int pose_ik_add_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(evt))
                 *      - the only thing that matters is that we want a target...
                 */
                if (tar_pchan)
-                       uiItemBooleanO(layout, "To Active Bone", 0, "POSE_OT_ik_add", "with_targets", 1);
+                       uiItemBooleanO(layout, "To Active Bone", ICON_NULL, "POSE_OT_ik_add", "with_targets", 1);
                else
-                       uiItemBooleanO(layout, "To Active Object", 0, "POSE_OT_ik_add", "with_targets", 1);
+                       uiItemBooleanO(layout, "To Active Object", ICON_NULL, "POSE_OT_ik_add", "with_targets", 1);
        }
        else {
                /* we have a choice of adding to a new empty, or not setting any target (targetless IK) */
-               uiItemBooleanO(layout, "To New Empty Object", 0, "POSE_OT_ik_add", "with_targets", 1);
-               uiItemBooleanO(layout, "Without Targets", 0, "POSE_OT_ik_add", "with_targets", 0);
+               uiItemBooleanO(layout, "To New Empty Object", ICON_NULL, "POSE_OT_ik_add", "with_targets", 1);
+               uiItemBooleanO(layout, "Without Targets", ICON_NULL, "POSE_OT_ik_add", "with_targets", 0);
        }
        
        /* finish building the menu, and process it (should result in calling self again) */
index 93b5ff6..63c9e39 100644 (file)
@@ -282,7 +282,7 @@ static int make_proxy_invoke (bContext *C, wmOperator *op, wmEvent *evt)
                PointerRNA props_ptr;
                
                /* create operator menu item with relevant properties filled in */
-               props_ptr= uiItemFullO(layout, op->idname, op->type->name, 0, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+               props_ptr= uiItemFullO(layout, op->idname, op->type->name, ICON_NULL, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
                
                /* present the menu and be done... */
                uiPupMenuEnd(C, pup);
@@ -687,7 +687,7 @@ static int parent_set_exec(bContext *C, wmOperator *op)
 static int parent_set_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(event))
 {
        Object *ob= ED_object_active_context(C);
-       uiPopupMenu *pup= uiPupMenuBegin(C, "Set Parent To", 0);
+       uiPopupMenu *pup= uiPupMenuBegin(C, "Set Parent To", ICON_NULL);
        uiLayout *layout= uiPupMenuLayout(pup);
        
        uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
index deda2ce..265fd84 100644 (file)
@@ -431,7 +431,7 @@ static short select_grouped_group(bContext *C, Object *ob)  /* Select objects in
        }
 
        /* build the menu. */
-       pup= uiPupMenuBegin(C, "Select Group", 0);
+       pup= uiPupMenuBegin(C, "Select Group", ICON_NULL);
        layout= uiPupMenuLayout(pup);
 
        for (i=0; i<group_count; i++) {
index 74c75a6..6f6b13a 100644 (file)
@@ -2132,11 +2132,11 @@ static int repeat_history_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(ev
        if(items==0)
                return OPERATOR_CANCELLED;
        
-       pup= uiPupMenuBegin(C, op->type->name, 0);
+       pup= uiPupMenuBegin(C, op->type->name, ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        for (i=items-1, lastop= wm->operators.last; lastop; lastop= lastop->prev, i--)
-               uiItemIntO(layout, lastop->type->name, 0, op->type->idname, "index", i);
+               uiItemIntO(layout, lastop->type->name, ICON_NULL, op->type->idname, "index", i);
        
        uiPupMenuEnd(C, pup);
        
@@ -2404,23 +2404,23 @@ static int header_toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *U
        uiPopupMenu *pup;
        uiLayout *layout;
        
-       pup= uiPupMenuBegin(C, "Header", 0);
+       pup= uiPupMenuBegin(C, "Header", ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        // XXX SCREEN_OT_region_flip doesn't work - gets wrong context for active region, so added custom operator
        if (ar->alignment == RGN_ALIGN_TOP)
-               uiItemO(layout, "Flip to Bottom", 0, "SCREEN_OT_header_flip");  
+               uiItemO(layout, "Flip to Bottom", ICON_NULL, "SCREEN_OT_header_flip");
        else
-               uiItemO(layout, "Flip to Top", 0, "SCREEN_OT_header_flip");
+               uiItemO(layout, "Flip to Top", ICON_NULL, "SCREEN_OT_header_flip");
        
        uiItemS(layout);
        
        /* file browser should be fullscreen all the time, but other regions can be maximised/restored... */
        if (sa->spacetype != SPACE_FILE) {
                if (sa->full) 
-                       uiItemO(layout, "Tile Area", 0, "SCREEN_OT_screen_full_area");
+                       uiItemO(layout, "Tile Area", ICON_NULL, "SCREEN_OT_screen_full_area");
                else
-                       uiItemO(layout, "Maximize Area", 0, "SCREEN_OT_screen_full_area");
+                       uiItemO(layout, "Maximize Area", ICON_NULL, "SCREEN_OT_screen_full_area");
        }
        
        uiPupMenuEnd(C, pup);
index 5ee2d1b..80d0b0f 100644 (file)
@@ -214,7 +214,7 @@ static void unpack_menu(bContext *C, const char *opname, const char *abs_name, c
        BLI_splitdirstring(local_name, fi);
        sprintf(local_name, "//%s/%s", folder, fi);
 
-       pup= uiPupMenuBegin(C, "Unpack file", 0);
+       pup= uiPupMenuBegin(C, "Unpack file", ICON_NULL);
        layout= uiPupMenuLayout(pup);
 
        uiItemEnumO(layout, opname, "Remove Pack", 0, "method", PF_REMOVE);
index abb2f68..18e906e 100644 (file)
@@ -64,7 +64,7 @@ static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(e
 
        RNA_pointer_create(&sc->id, &RNA_SpaceProperties, sbuts, &ptr);
 
-       pup= uiPupMenuBegin(C, "Align", 0);
+       pup= uiPupMenuBegin(C, "Align", ICON_NULL);
        layout= uiPupMenuLayout(pup);
        uiItemsEnumR(layout, &ptr, "align");
        uiPupMenuEnd(C, pup);
index 4ce4925..4d9bd9b 100644 (file)
@@ -139,7 +139,7 @@ static void file_panel_bookmarks(const bContext *C, Panel *pa)
        if(sfile) {
                row= uiLayoutRow(pa->layout, 0);
                uiItemO(row, "Add", ICON_ZOOMIN, "file.bookmark_add");
-               uiItemL(row, NULL, 0);
+               uiItemL(row, NULL, ICON_NULL);
 
                file_panel_category(C, pa, FS_CATEGORY_BOOKMARKS, &sfile->bookmarknr, ICON_BOOKMARKS, 1, 0);
        }
index ee66c66..3274e65 100644 (file)
@@ -138,19 +138,19 @@ static void graph_panel_view(const bContext *C, Panel *pa)
 
        /* 2D-Cursor */
        col= uiLayoutColumn(pa->layout, 0);
-               uiItemR(col, &spaceptr, "show_cursor", 0, NULL, 0);
+               uiItemR(col, &spaceptr, "show_cursor", 0, NULL, ICON_NULL);
                
                subcol= uiLayoutColumn(col, 1);
                uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); 
-                       uiItemO(subcol, "Cursor from Selection", 0, "GRAPH_OT_frame_jump");
+                       uiItemO(subcol, "Cursor from Selection", ICON_NULL, "GRAPH_OT_frame_jump");
                
                subcol= uiLayoutColumn(col, 1);
                uiLayoutSetActive(subcol, RNA_boolean_get(&spaceptr, "show_cursor")); 
                        row= uiLayoutSplit(subcol, 0.7, 1);
-                               uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", 0);
+                               uiItemR(row, &sceneptr, "frame_current", 0, "Cursor X", ICON_NULL);
                                uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_CFRA);
                        row= uiLayoutSplit(subcol, 0.7, 1);
-                               uiItemR(row, &spaceptr, "cursor_position_y", 0, "Cursor Y", 0);
+                               uiItemR(row, &spaceptr, "cursor_position_y", 0, "Cursor Y", ICON_NULL);
                                uiItemEnumO(row, "GRAPH_OT_snap", "To Keys", 0, "type", GRAPHKEYS_SNAP_VALUE);
 }
 
@@ -186,18 +186,18 @@ static void graph_panel_properties(const bContext *C, Panel *pa)
        col= uiLayoutColumn(layout, 1);
                uiLayoutSetEnabled(col, (fcu->flag & FCURVE_DISABLED)!=0); 
                uiItemR(col, &fcu_ptr, "data_path", 0, "", ICON_RNA);
-               uiItemR(col, &fcu_ptr, "array_index", 0, NULL, 0);
+               uiItemR(col, &fcu_ptr, "array_index", 0, NULL, ICON_NULL);
                
        /* color settings */
        col= uiLayoutColumn(layout, 1);
-               uiItemL(col, "Display Color:", 0);
+               uiItemL(col, "Display Color:", ICON_NULL);
                
                row= uiLayoutRow(col, 1);
-                       uiItemR(row, &fcu_ptr, "color_mode", 0, "", 0);
+                       uiItemR(row, &fcu_ptr, "color_mode", 0, "", ICON_NULL);
                        
                        subrow= uiLayoutRow(row, 1);
                                uiLayoutSetEnabled(subrow, (fcu->color_mode==FCURVE_COLOR_CUSTOM));
-                               uiItemR(subrow, &fcu_ptr, "color", 0, "", 0);
+                               uiItemR(subrow, &fcu_ptr, "color", 0, "", ICON_NULL);
        
        MEM_freeN(ale);
 }
@@ -263,23 +263,23 @@ static void graph_panel_key_properties(const bContext *C, Panel *pa)
                
                /* interpolation */
                col= uiLayoutColumn(layout, 0);
-                       uiItemR(col, &bezt_ptr, "interpolation", 0, NULL, 0);
+                       uiItemR(col, &bezt_ptr, "interpolation", 0, NULL, ICON_NULL);
                        
                /* numerical coordinate editing */
                col= uiLayoutColumn(layout, 1);
                        /* keyframe itself */
-                       uiItemR(col, &bezt_ptr, "co", 0, "Key", 0);
+                       uiItemR(col, &bezt_ptr, "co", 0, "Key", ICON_NULL);
                        
                        /* previous handle - only if previous was Bezier interpolation */
                        if ((prevbezt) && (prevbezt->ipo == BEZT_IPO_BEZ))
-                               uiItemR(col, &bezt_ptr, "handle_left", 0, NULL, 0);
+                               uiItemR(col, &bezt_ptr, "handle_left", 0, NULL, ICON_NULL);
                        
                        /* next handle - only if current is Bezier interpolation */
                        if (bezt->ipo == BEZT_IPO_BEZ)
-                               uiItemR(col, &bezt_ptr, "handle_right", 0, NULL, 0);
+                               uiItemR(col, &bezt_ptr, "handle_right", 0, NULL, ICON_NULL);
        }
        else
-               uiItemL(layout, "No active keyframe on F-Curve", 0);
+               uiItemL(layout, "No active keyframe on F-Curve", ICON_NULL);
        
        MEM_freeN(ale);
 }
@@ -456,7 +456,7 @@ static void graph_panel_driverVar__locDiff(uiLayout *layout, ID *id, DriverVar *
                        uiItemPointerR(col, &dtar_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
                }
                
-               uiItemR(col, &dtar_ptr, "use_local_space_transform", 0, NULL, 0);
+               uiItemR(col, &dtar_ptr, "use_local_space_transform", 0, NULL, ICON_NULL);
        
        col= uiLayoutColumn(layout, 1);
                uiTemplateAnyID(col, &dtar2_ptr, "id", "id_type", "Ob/Bone 2:");
@@ -468,7 +468,7 @@ static void graph_panel_driverVar__locDiff(uiLayout *layout, ID *id, DriverVar *
                        uiItemPointerR(col, &dtar2_ptr, "bone_target", &tar_ptr, "bones", "", ICON_BONE_DATA);
                }
                
-               uiItemR(col, &dtar2_ptr, "use_local_space_transform", 0, NULL, 0);
+               uiItemR(col, &dtar2_ptr, "use_local_space_transform", 0, NULL, ICON_NULL);
 }
 
 /* settings for 'transform channel' driver variable type */
@@ -494,8 +494,8 @@ static void graph_panel_driverVar__transChan(uiLayout *layout, ID *id, DriverVar
                }
                
                row= uiLayoutRow(layout, 1);
-                       uiItemR(row, &dtar_ptr, "transform_type", 0, "", 0);
-                       uiItemR(row, &dtar_ptr, "use_local_space_transform", 0, NULL, 0);
+                       uiItemR(row, &dtar_ptr, "transform_type", 0, "", ICON_NULL);
+                       uiItemR(row, &dtar_ptr, "use_local_space_transform", 0, NULL, ICON_NULL);
 }
 
 /* driver settings for active F-Curve (only for 'Drivers' mode) */
@@ -534,12 +534,12 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
        
        col= uiLayoutColumn(pa->layout, 1);
        block= uiLayoutGetBlock(col);
-               uiItemR(col, &driver_ptr, "type", 0, NULL, 0);
+               uiItemR(col, &driver_ptr, "type", 0, NULL, ICON_NULL);
                
                /* show expression box if doing scripted drivers, and/or error messages when invalid drivers exist */
                if (driver->type == DRIVER_TYPE_PYTHON) {
                        /* expression */
-                       uiItemR(col, &driver_ptr, "expression", 0, "Expr", 0);
+                       uiItemR(col, &driver_ptr, "expression", 0, "Expr", ICON_NULL);
                        
                        /* errors? */
                        if (driver->flag & DRIVER_FLAG_INVALID)
@@ -553,17 +553,17 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
                
        col= uiLayoutColumn(pa->layout, 1);
                /* debug setting */
-               uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, 0);
+               uiItemR(col, &driver_ptr, "show_debug_info", 0, NULL, ICON_NULL);
                
                /* value of driver */
                if (driver->flag & DRIVER_FLAG_SHOWDEBUG) {
                        uiLayout *row= uiLayoutRow(col, 1);
                        char valBuf[32];
                        
-                       uiItemL(row, "Driver Value:", 0);
+                       uiItemL(row, "Driver Value:", ICON_NULL);
                        
                        sprintf(valBuf, "%.3f", driver->curval);
-                       uiItemL(row, valBuf, 0);
+                       uiItemL(row, valBuf, ICON_NULL);
                }
        
        /* add driver variables */
@@ -588,7 +588,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
                        row= uiLayoutRow(box, 0);
                        block= uiLayoutGetBlock(row);
                                /* variable name */
-                               uiItemR(row, &dvar_ptr, "name", 0, "", 0);
+                               uiItemR(row, &dvar_ptr, "name", 0, "", ICON_NULL);
                                
                                /* remove button */
                                uiBlockSetEmboss(block, UI_EMBOSSN);
@@ -598,7 +598,7 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
                        
                        /* variable type */
                        row= uiLayoutRow(box, 0);
-                               uiItemR(row, &dvar_ptr, "type", 0, "", 0);
+                               uiItemR(row, &dvar_ptr, "type", 0, "", ICON_NULL);
                                
                /* variable type settings */
                box= uiLayoutBox(col);
@@ -624,10 +624,10 @@ static void graph_panel_drivers(const bContext *C, Panel *pa)
                        
                        box= uiLayoutBox(col);
                        row= uiLayoutRow(box, 1);
-                               uiItemL(row, "Value:", 0);
+                               uiItemL(row, "Value:", ICON_NULL);
                                
                                sprintf(valBuf, "%.3f", dvar->curval);
-                               uiItemL(row, valBuf, 0);
+                               uiItemL(row, valBuf, ICON_NULL);
                }
        }
        
index 1e6443b..3602977 100644 (file)
@@ -1922,7 +1922,7 @@ static int graph_fmodifier_add_invoke (bContext *C, wmOperator *op, wmEvent *UNU
        uiLayout *layout;
        int i;
        
-       pup= uiPupMenuBegin(C, "Add F-Curve Modifier", 0);
+       pup= uiPupMenuBegin(C, "Add F-Curve Modifier", ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        /* start from 1 to skip the 'Invalid' modifier type */
@@ -1935,7 +1935,7 @@ static int graph_fmodifier_add_invoke (bContext *C, wmOperator *op, wmEvent *UNU
                        continue;
                
                /* create operator menu item with relevant properties filled in */
-               props_ptr= uiItemFullO(layout, "GRAPH_OT_fmodifier_add", fmi->name, 0, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
+               props_ptr= uiItemFullO(layout, "GRAPH_OT_fmodifier_add", fmi->name, ICON_NULL, NULL, WM_OP_EXEC_REGION_WIN, UI_ITEM_O_RETURN_PROPS);
                        /* the only thing that gets set from the menu is the type of F-Modifier to add */
                RNA_enum_set(&props_ptr, "type", i);
                        /* the following properties are just repeats of existing ones... */
index 9a7aab7..756be43 100644 (file)
@@ -717,7 +717,7 @@ static void uiblock_layer_pass_arrow_buttons(uiLayout *layout, RenderResult *rr,
        if(rr==NULL || iuser==NULL)
                return;
        if(rr->layers.first==NULL) {
-               uiItemL(row, "No Layers in Render Result.", 0);
+               uiItemL(row, "No Layers in Render Result.", ICON_NULL);
                return;
        }
 
@@ -811,8 +811,8 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
                        image_info(ima, ibuf, str);
                        BKE_image_release_ibuf(ima, lock);
 
-                       uiItemL(layout, ima->id.name+2, 0);
-                       uiItemL(layout, str, 0);
+                       uiItemL(layout, ima->id.name+2, ICON_NULL);
+                       uiItemL(layout, str, ICON_NULL);
 
                        if(ima->type==IMA_TYPE_COMPOSITE) {
                                // XXX not working yet
@@ -844,7 +844,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
                }
                else {
                        row= uiLayoutRow(layout, 0);
-                       uiItemR(row, &imaptr, "source", 0, NULL, 0);
+                       uiItemR(row, &imaptr, "source", 0, NULL, ICON_NULL);
 
                        if(ima->source != IMA_SRC_GENERATED) {
                                row= uiLayoutRow(layout, 1);
@@ -858,7 +858,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
                                row= uiLayoutRow(split, 1);
                                uiLayoutSetEnabled(row, ima->packedfile==NULL);
                                
-                               uiItemR(row, &imaptr, "filepath", 0, "", 0);
+                               uiItemR(row, &imaptr, "filepath", 0, "", ICON_NULL);
                                uiItemO(row, "", ICON_FILE_REFRESH, "image.reload");
                        }
 
@@ -882,7 +882,7 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
                                        ibuf= BKE_image_acquire_ibuf(ima, iuser, &lock);
                                        image_info(ima, ibuf, str);
                                        BKE_image_release_ibuf(ima, lock);
-                                       uiItemL(layout, str, 0);
+                                       uiItemL(layout, str, ICON_NULL);
                                }
                        }
                        
@@ -893,13 +893,13 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
                                        split= uiLayoutSplit(layout, 0, 0);
 
                                        col= uiLayoutColumn(split, 0);
-                                       uiItemR(col, &imaptr, "use_fields", 0, NULL, 0);
+                                       uiItemR(col, &imaptr, "use_fields", 0, NULL, ICON_NULL);
                                        row= uiLayoutRow(col, 0);
-                                       uiItemR(row, &imaptr, "field_order", UI_ITEM_R_EXPAND, NULL, 0);
+                                       uiItemR(row, &imaptr, "field_order", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                                        uiLayoutSetActive(row, RNA_boolean_get(&imaptr, "use_fields"));
 
                                        col= uiLayoutColumn(split, 0);
-                                       uiItemR(col, &imaptr, "use_premultiply", 0, NULL, 0);
+                                       uiItemR(col, &imaptr, "use_premultiply", 0, NULL, ICON_NULL);
                                }
                        }
 
@@ -912,30 +912,30 @@ void uiTemplateImage(uiLayout *layout, bContext *C, PointerRNA *ptr, const char
                                 
                                sprintf(str, "(%d) Frames", iuser->framenr);
                                row= uiLayoutRow(col, 1);
-                               uiItemR(col, userptr, "frame_duration", 0, str, 0);
+                               uiItemR(col, userptr, "frame_duration", 0, str, ICON_NULL);
                                if(ima->anim) {
                                        block= uiLayoutGetBlock(row);
                                        but= uiDefBut(block, BUT, 0, "Match Movie Length", 0, 0, UI_UNIT_X*2, UI_UNIT_Y, 0, 0, 0, 0, 0, "Set the number of frames to match the movie or sequence.");
                                        uiButSetFunc(but, set_frames_cb, ima, iuser);
                                }
 
-                               uiItemR(col, userptr, "frame_start", 0, "Start", 0);
-                               uiItemR(col, userptr, "frame_offset", 0, NULL, 0);
+                               uiItemR(col, userptr, "frame_start", 0, "Start", ICON_NULL);
+                               uiItemR(col, userptr, "frame_offset", 0, NULL, ICON_NULL);
 
                                col= uiLayoutColumn(split, 0);
-                               uiItemR(col, userptr, "fields_per_frame", 0, "Fields", 0);
-                               uiItemR(col, userptr, "use_auto_refresh", 0, NULL, 0);
-                               uiItemR(col, userptr, "use_cyclic", 0, NULL, 0);
+                               uiItemR(col, userptr, "fields_per_frame", 0, "Fields", ICON_NULL);
+                               uiItemR(col, userptr, "use_auto_refresh", 0, NULL, ICON_NULL);
+                               uiItemR(col, userptr, "use_cyclic", 0, NULL, ICON_NULL);
                        }
                        else if(ima->source==IMA_SRC_GENERATED) {
                                split= uiLayoutSplit(layout, 0, 0);
 
                                col= uiLayoutColumn(split, 1);
-                               uiItemR(col, &imaptr, "generated_width", 0, "X", 0);
-                               uiItemR(col, &imaptr, "generated_height", 0, "Y", 0);
+                               uiItemR(col, &imaptr, "generated_width", 0, "X", ICON_NULL);
+                               uiItemR(col, &imaptr, "generated_height", 0, "Y", ICON_NULL);
 
                                col= uiLayoutColumn(split, 0);
-                               uiItemR(col, &imaptr, "generated_type", UI_ITEM_R_EXPAND, NULL, 0);
+                               uiItemR(col, &imaptr, "generated_type", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        }
 
                                        }
index 498b3b8..7725928 100644 (file)
@@ -63,13 +63,13 @@ static int toolbox_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent *UNUSED(e
 
        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);
 
index 594de9b..2b6958e 100644 (file)
@@ -1403,7 +1403,7 @@ static int pack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
        if(!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
                pup= uiPupMenuBegin(C, "OK", ICON_QUESTION);
                layout= uiPupMenuLayout(pup);
-               uiItemBooleanO(layout, "Can't pack edited image from disk. Pack as internal PNG?", 0, op->idname, "as_png", 1);
+               uiItemBooleanO(layout, "Can't pack edited image from disk. Pack as internal PNG?", ICON_NULL, op->idname, "as_png", 1);
                uiPupMenuEnd(C, pup);
 
                return OPERATOR_CANCELLED;
@@ -1445,7 +1445,7 @@ static void unpack_menu(bContext *C, const char *opname, Image *ima, const char
        BLI_splitdirstring(local_name, fi);
        sprintf(local_name, "//%s/%s", folder, fi);
 
-       pup= uiPupMenuBegin(C, "Unpack file", 0);
+       pup= uiPupMenuBegin(C, "Unpack file", ICON_NULL);
        layout= uiPupMenuLayout(pup);
 
        uiItemEnumO(layout, opname, "Remove Pack", 0, "method", PF_REMOVE);
@@ -1454,7 +1454,7 @@ static void unpack_menu(bContext *C, const char *opname, Image *ima, const char
                switch(checkPackedFile(local_name, pf)) {
                        case PF_NOFILE:
                                sprintf(line, "Create %s", local_name);
-                               props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                               props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                                RNA_enum_set(&props_ptr, "method", PF_WRITE_LOCAL);
                                RNA_string_set(&props_ptr, "image", ima->id.name+2);
        
@@ -1462,7 +1462,7 @@ static void unpack_menu(bContext *C, const char *opname, Image *ima, const char
                        case PF_EQUAL:
                                sprintf(line, "Use %s (identical)", local_name);
                                //uiItemEnumO(layout, opname, line, 0, "method", PF_USE_LOCAL);
-                               props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                               props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                                RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL);
                                RNA_string_set(&props_ptr, "image", ima->id.name+2);
                                
@@ -1470,13 +1470,13 @@ static void unpack_menu(bContext *C, const char *opname, Image *ima, const char
                        case PF_DIFFERS:
                                sprintf(line, "Use %s (differs)", local_name);
                                //uiItemEnumO(layout, opname, line, 0, "method", PF_USE_LOCAL);
-                               props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                               props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                                RNA_enum_set(&props_ptr, "method", PF_USE_LOCAL);
                                RNA_string_set(&props_ptr, "image", ima->id.name);
                                
                                sprintf(line, "Overwrite %s", local_name);
                                //uiItemEnumO(layout, opname, line, 0, "method", PF_WRITE_LOCAL);
-                               props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                               props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                                RNA_enum_set(&props_ptr, "method", PF_WRITE_LOCAL);
                                RNA_string_set(&props_ptr, "image", ima->id.name+2);
                                
@@ -1489,27 +1489,27 @@ static void unpack_menu(bContext *C, const char *opname, Image *ima, const char
                case PF_NOFILE:
                        sprintf(line, "Create %s", abs_name);
                        //uiItemEnumO(layout, opname, line, 0, "method", PF_WRITE_ORIGINAL);
-                       props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                       props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                        RNA_enum_set(&props_ptr, "method", PF_WRITE_ORIGINAL);
                        RNA_string_set(&props_ptr, "image", ima->id.name+2);
                        break;
                case PF_EQUAL:
                        sprintf(line, "Use %s (identical)", abs_name);
                        //uiItemEnumO(layout, opname, line, 0, "method", PF_USE_ORIGINAL);
-                       props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                       props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                        RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL);
                        RNA_string_set(&props_ptr, "image", ima->id.name+2);
                        break;
                case PF_DIFFERS:
                        sprintf(line, "Use %s (differs)", local_name);
                        //uiItemEnumO(layout, opname, line, 0, "method", PF_USE_ORIGINAL);
-                       props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                       props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                        RNA_enum_set(&props_ptr, "method", PF_USE_ORIGINAL);
                        RNA_string_set(&props_ptr, "image", ima->id.name+2);
                        
                        sprintf(line, "Overwrite %s", local_name);
                        //uiItemEnumO(layout, opname, line, 0, "method", PF_WRITE_ORIGINAL);
-                       props_ptr= uiItemFullO(layout, opname, line, 0, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
+                       props_ptr= uiItemFullO(layout, opname, line, ICON_NULL, NULL, WM_OP_EXEC_DEFAULT, UI_ITEM_O_RETURN_PROPS);
                        RNA_enum_set(&props_ptr, "method", PF_WRITE_ORIGINAL);
                        RNA_string_set(&props_ptr, "image", ima->id.name+2);
                        break;
index a5e47e7..190814a 100644 (file)
@@ -154,7 +154,7 @@ static int unpack_all_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)
        else
                sprintf(title, "Unpack %d files", count);
        
-       pup= uiPupMenuBegin(C, title, 0);
+       pup= uiPupMenuBegin(C, title, ICON_NULL);
        layout= uiPupMenuLayout(pup);
 
        uiLayoutSetOperatorContext(layout, WM_OP_EXEC_DEFAULT);
index ba417f0..8bfcad4 100644 (file)
@@ -273,7 +273,7 @@ static void recent_files_menu_draw(const bContext *UNUSED(C), Menu *menu)
                        uiItemStringO(layout, BLI_path_basename(recent->filepath), ICON_FILE_BLEND, "WM_OT_open_mainfile", "filepath", recent->filepath);
                }
        } else {
-               uiItemL(layout, "No Recent Files", 0);
+               uiItemL(layout, "No Recent Files", ICON_NULL);
        }
 }
 
index 068ac01..bd97e1e 100644 (file)
@@ -3182,19 +3182,19 @@ static void draw_sensor_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *lo
        box= uiLayoutBox(layout);
        row= uiLayoutRow(box, 0);
        
-       uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", 0);
+       uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NULL);
        if(RNA_boolean_get(ptr, "show_expanded")) {
-               uiItemR(row, ptr, "type", 0, "", 0);
-               uiItemR(row, ptr, "name", 0, "", 0);
+               uiItemR(row, ptr, "type", 0, "", ICON_NULL);
+               uiItemR(row, ptr, "name", 0, "", ICON_NULL);
        } else {
-               uiItemL(row, sensor_name(sens->type), 0);
-               uiItemL(row, sens->name, 0);
+               uiItemL(row, sensor_name(sens->type), ICON_NULL);
+               uiItemL(row, sens->name, ICON_NULL);
        }
 
        subrow= uiLayoutRow(row, 0);
        uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "show_sensors_active_states")
                                                        && RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")));
-       uiItemR(subrow, ptr, "pin", UI_ITEM_R_NO_BG, "", 0);
+       uiItemR(subrow, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NULL);
 
        if(RNA_boolean_get(ptr, "show_expanded")==0) {
                subrow= uiLayoutRow(row, 1);
@@ -3215,14 +3215,14 @@ static void draw_sensor_internal_header(uiLayout *layout, PointerRNA *ptr)
        row= uiLayoutRow(split, 1);
        uiItemR(row, ptr, "use_pulse_true_level", 0, "", ICON_DOTSUP);
        uiItemR(row, ptr, "use_pulse_false_level", 0, "", ICON_DOTSDOWN);
-       uiItemR(row, ptr, "frequency", 0, "Freq", 0);
+       uiItemR(row, ptr, "frequency", 0, "Freq", ICON_NULL);
        
        row= uiLayoutRow(split, 1);
-       uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, 0);
-       uiItemR(row, ptr, "use_tap", UI_ITEM_R_TOGGLE, NULL, 0);
+       uiItemR(row, ptr, "use_level", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_tap", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
        
        row= uiLayoutRow(split, 1);
-       uiItemR(row, ptr, "invert", UI_ITEM_R_TOGGLE, "Invert", 0);
+       uiItemR(row, ptr, "invert", UI_ITEM_R_TOGGLE, "Invert", ICON_NULL);
 }
 /* sensors in alphabetical order */
 
@@ -3245,7 +3245,7 @@ static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
        uiLayout *row;
 
        if(ob->type != OB_ARMATURE){
-               uiItemL(layout, "Sensor only available for armatures", 0);
+               uiItemL(layout, "Sensor only available for armatures", ICON_NULL);
                return;
        }
 
@@ -3261,8 +3261,8 @@ static void draw_sensor_armature(uiLayout *layout, PointerRNA *ptr)
                        uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
        }
        row = uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "test_type", 0, NULL, 0);
-       uiItemR(row, ptr, "value", 0, NULL, 0);
+       uiItemR(row, ptr, "test_type", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "value", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr, bContext *C)
@@ -3274,12 +3274,12 @@ static void draw_sensor_collision(uiLayout *layout, PointerRNA *ptr, bContext *C
 
        split = uiLayoutSplit(layout, 0.3, 0);
        row = uiLayoutRow(split, 1);
-       uiItemR(row, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, 0);
-       uiItemR(row, ptr, "use_material", UI_ITEM_R_TOGGLE, NULL, 0);
+       uiItemR(row, ptr, "use_pulse", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_material", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
        switch (RNA_enum_get(ptr, "use_material")) {
                case SENS_COLLISION_PROPERTY:
-                       uiItemR(split, ptr, "property", 0, NULL, 0);
+                       uiItemR(split, ptr, "property", 0, NULL, ICON_NULL);
                        break;
                case SENS_COLLISION_MATERIAL:
                        uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
@@ -3293,48 +3293,48 @@ static void draw_sensor_delay(uiLayout *layout, PointerRNA *ptr)
        
        row= uiLayoutRow(layout, 0);
 
-       uiItemR(row, ptr, "delay", 0, NULL, 0);
-       uiItemR(row, ptr, "duration", 0, NULL, 0);
-       uiItemR(row, ptr, "use_repeat", 0, NULL, 0);
+       uiItemR(row, ptr, "delay", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "duration", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_repeat", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_joystick(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *col, *row;
 
-       uiItemR(layout, ptr, "joystick_index", 0, NULL, 0);
-       uiItemR(layout, ptr, "event_type", 0, NULL, 0);
+       uiItemR(layout, ptr, "joystick_index", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "event_type", 0, NULL, ICON_NULL);
 
        switch (RNA_enum_get(ptr, "event_type")) {
                case SENS_JOY_BUTTON:
-                       uiItemR(layout, ptr, "use_all_events", 0, NULL, 0);
+                       uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NULL);
 
                        col = uiLayoutColumn(layout, 0);
                        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events")==0);
-                       uiItemR(col, ptr, "button_number", 0, NULL, 0);
+                       uiItemR(col, ptr, "button_number", 0, NULL, ICON_NULL);
                        break;
                case SENS_JOY_AXIS:
                        row = uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "axis_number", 0, NULL, 0);
-                       uiItemR(row, ptr, "axis_threshold", 0, NULL, 0);
+                       uiItemR(row, ptr, "axis_number", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "axis_threshold", 0, NULL, ICON_NULL);
 
-                       uiItemR(layout, ptr, "use_all_events", 0, NULL, 0);
+                       uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NULL);
                        col = uiLayoutColumn(layout, 0);
                        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events")==0);
-                       uiItemR(col, ptr, "axis_direction", 0, NULL, 0);
+                       uiItemR(col, ptr, "axis_direction", 0, NULL, ICON_NULL);
                        break;
                case SENS_JOY_HAT:
-                       uiItemR(layout, ptr, "hat_number", 0, NULL, 0);
-                       uiItemR(layout, ptr, "use_all_events", 0, NULL, 0);
+                       uiItemR(layout, ptr, "hat_number", 0, NULL, ICON_NULL);
+                       uiItemR(layout, ptr, "use_all_events", 0, NULL, ICON_NULL);
 
                        col = uiLayoutColumn(layout, 0);
                        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_events")==0);
-                       uiItemR(col, ptr, "hat_direction", 0, NULL, 0);
+                       uiItemR(col, ptr, "hat_direction", 0, NULL, ICON_NULL);
                        break;
                case SENS_JOY_AXIS_SINGLE:
                        row = uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "single_axis_number", 0, NULL, 0);
-                       uiItemR(row, ptr, "axis_threshold", 0, NULL, 0);
+                       uiItemR(row, ptr, "single_axis_number", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "axis_threshold", 0, NULL, ICON_NULL);
                        break;
        }
 }
@@ -3346,47 +3346,47 @@ static void draw_sensor_keyboard(uiLayout *layout, PointerRNA *ptr)
        uiLayout *row, *col;
 
        row = uiLayoutRow(layout, 0);
-       uiItemL(row, "Key:", 0);
+       uiItemL(row, "Key:", ICON_NULL);
        col = uiLayoutColumn(row, 0);
        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys")==0);
-       uiItemR(col, ptr, "key", UI_ITEM_R_EVENT, "", 0);
+       uiItemR(col, ptr, "key", UI_ITEM_R_EVENT, "", ICON_NULL);
        col = uiLayoutColumn(row, 0);
-       uiItemR(col, ptr, "use_all_keys", UI_ITEM_R_TOGGLE, NULL, 0);
+       uiItemR(col, ptr, "use_all_keys", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
        
        col = uiLayoutColumn(layout, 0);
        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_all_keys")==0);
        row = uiLayoutRow(col, 0);
-       uiItemL(row, "First Modifier:", 0);
-       uiItemR(row, ptr, "modifier_key_1", UI_ITEM_R_EVENT, "", 0);
+       uiItemL(row, "First Modifier:", ICON_NULL);
+       uiItemR(row, ptr, "modifier_key_1", UI_ITEM_R_EVENT, "", ICON_NULL);
        
        row = uiLayoutRow(col, 0);
-       uiItemL(row, "Second Modifier:", 0);
-       uiItemR(row, ptr, "modifier_key_2", UI_ITEM_R_EVENT, "", 0);
+       uiItemL(row, "Second Modifier:", ICON_NULL);
+       uiItemR(row, ptr, "modifier_key_2", UI_ITEM_R_EVENT, "", ICON_NULL);
 
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-       uiItemPointerR(layout, ptr, "log", &settings_ptr, "properties", NULL, 0);
-       uiItemPointerR(layout, ptr, "target", &settings_ptr, "properties", NULL, 0);
+       uiItemPointerR(layout, ptr, "log", &settings_ptr, "properties", NULL, ICON_NULL);
+       uiItemPointerR(layout, ptr, "target", &settings_ptr, "properties", NULL, ICON_NULL);
 }
 
 static void draw_sensor_message(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "subject", 0, NULL, 0);
+       uiItemR(layout, ptr, "subject", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_mouse(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "mouse_event", 0, NULL, 0);
+       uiItemR(layout, ptr, "mouse_event", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_near(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *row;
 
-       uiItemR(layout, ptr, "property", 0, NULL, 0);
+       uiItemR(layout, ptr, "property", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "distance", 0, NULL, 0);
-       uiItemR(row, ptr, "reset_distance", 0, NULL, 0);
+       uiItemR(row, ptr, "distance", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "reset_distance", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_property(uiLayout *layout, PointerRNA *ptr)
@@ -3395,22 +3395,22 @@ static void draw_sensor_property(uiLayout *layout, PointerRNA *ptr)
        PointerRNA settings_ptr;
 
        uiLayout *row;
-       uiItemR(layout, ptr, "evaluation_type", 0, NULL, 0);
+       uiItemR(layout, ptr, "evaluation_type", 0, NULL, ICON_NULL);
 
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
-       uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, 0);
+       uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, ICON_NULL);
 
        switch (RNA_enum_get(ptr, "evaluation_type")) {
                case SENS_PROP_INTERVAL:
                        row = uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "value_min", 0, NULL, 0);
-                       uiItemR(row, ptr, "value_max", 0, NULL, 0);
+                       uiItemR(row, ptr, "value_min", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "value_max", 0, NULL, ICON_NULL);
                        break;
                case SENS_PROP_EQUAL:
-                       uiItemR(layout, ptr, "value", 0, NULL, 0);
+                       uiItemR(layout, ptr, "value", 0, NULL, ICON_NULL);
                        break;
                case SENS_PROP_NEQUAL:
-                       uiItemR(layout, ptr, "value", 0, NULL, 0);
+                       uiItemR(layout, ptr, "value", 0, NULL, ICON_NULL);
                        break;
                case SENS_PROP_CHANGED:
                        break;
@@ -3421,17 +3421,17 @@ static void draw_sensor_radar(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *row;
 
-       uiItemR(layout, ptr, "property", 0, NULL, 0);
-       uiItemR(layout, ptr, "axis", 0, NULL, 0);
+       uiItemR(layout, ptr, "property", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "axis", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "angle", 0, NULL, 0);
-       uiItemR(row, ptr, "distance", 0, NULL, 0);
+       uiItemR(row, ptr, "angle", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "distance", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_random(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "seed", 0, NULL, 0);
+       uiItemR(layout, ptr, "seed", 0, NULL, ICON_NULL);
 }
 
 static void draw_sensor_ray(uiLayout *layout, PointerRNA *ptr, bContext *C)
@@ -3441,10 +3441,10 @@ static void draw_sensor_ray(uiLayout *layout, PointerRNA *ptr, bContext *C)
 
        RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
        split= uiLayoutSplit(layout, 0.3, 0);
-       uiItemR(split, ptr, "ray_type", 0, "", 0);
+       uiItemR(split, ptr, "ray_type", 0, "", ICON_NULL);
        switch (RNA_enum_get(ptr, "ray_type")) {
                case SENS_RAY_PROPERTY:
-                       uiItemR(split, ptr, "property", 0, "", 0);
+                       uiItemR(split, ptr, "property", 0, "", ICON_NULL);
                        break;
                case SENS_RAY_MATERIAL:
                        uiItemPointerR(split, ptr, "material", &main_ptr, "materials", "", ICON_MATERIAL_DATA);
@@ -3452,15 +3452,15 @@ static void draw_sensor_ray(uiLayout *layout, PointerRNA *ptr, bContext *C)
        }
 
        split= uiLayoutSplit(layout, 0.3, 0);
-       uiItemR(split, ptr, "axis", 0, "", 0);
+       uiItemR(split, ptr, "axis", 0, "", ICON_NULL);
        row= uiLayoutRow(split, 0);     
-       uiItemR(row, ptr, "range", 0, NULL, 0);
-       uiItemR(row, ptr, "use_x_ray", UI_ITEM_R_TOGGLE, NULL, 0);
+       uiItemR(row, ptr, "range", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_x_ray", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 }
 
 static void draw_sensor_touch(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "material", 0, NULL, 0);
+       uiItemR(layout, ptr, "material", 0, NULL, ICON_NULL);
 }
 
 void draw_brick_sensor(uiLayout *layout, PointerRNA *ptr, bContext *C)
@@ -3535,19 +3535,19 @@ static void draw_controller_header(uiLayout *layout, PointerRNA *ptr, int xco, i
        box= uiLayoutBox(layout);
        row= uiLayoutRow(box, 0);
        
-       uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", 0);
+       uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NULL);
        if(RNA_boolean_get(ptr, "show_expanded")) {
-               uiItemR(row, ptr, "type", 0, "", 0);
-               uiItemR(row, ptr, "name", 0, "", 0);
+               uiItemR(row, ptr, "type", 0, "", ICON_NULL);
+               uiItemR(row, ptr, "name", 0, "", ICON_NULL);
                /* XXX provisory for Blender 2.50Beta */
                uiDefBlockBut(uiLayoutGetBlock(layout), controller_state_mask_menu, cont, state, (short)(xco+width-44), yco, 22+22, UI_UNIT_Y, "Set controller state index (from 1 to 30)");
        } else {
-               uiItemL(row, controller_name(cont->type), 0);
-               uiItemL(row, cont->name, 0);
-               uiItemL(row, state, 0);
+               uiItemL(row, controller_name(cont->type), ICON_NULL);
+               uiItemL(row, cont->name, ICON_NULL);
+               uiItemL(row, state, ICON_NULL);
        }
 
-       uiItemR(row, ptr, "use_priority", 0, "", 0);
+       uiItemR(row, ptr, "use_priority", 0, "", ICON_NULL);
 
        if(RNA_boolean_get(ptr, "show_expanded")==0) {
                subrow= uiLayoutRow(row, 1);
@@ -3559,7 +3559,7 @@ static void draw_controller_header(uiLayout *layout, PointerRNA *ptr, int xco, i
 
 static void draw_controller_expression(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "expression", 0, "", 0);
+       uiItemR(layout, ptr, "expression", 0, "", ICON_NULL);
 }
 
 static void draw_controller_python(uiLayout *layout, PointerRNA *ptr)
@@ -3567,14 +3567,14 @@ static void draw_controller_python(uiLayout *layout, PointerRNA *ptr)
        uiLayout *split, *subsplit;
 
        split = uiLayoutSplit(layout, 0.3, 1);
-       uiItemR(split, ptr, "mode", 0, "", 0);
+       uiItemR(split, ptr, "mode", 0, "", ICON_NULL);
        if (RNA_enum_get(ptr, "mode") == CONT_PY_SCRIPT) {
-               uiItemR(split, ptr, "text", 0, "", 0);
+               uiItemR(split, ptr, "text", 0, "", ICON_NULL);
        }
        else {
                subsplit = uiLayoutSplit(split, 0.8, 0);
-               uiItemR(subsplit, ptr, "module", 0, "", 0);
-               uiItemR(subsplit, ptr, "use_debug", UI_ITEM_R_TOGGLE, NULL, 0);
+               uiItemR(subsplit, ptr, "module", 0, "", ICON_NULL);
+               uiItemR(subsplit, ptr, "use_debug", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
        }
 }
 
@@ -3625,19 +3625,19 @@ static void draw_actuator_header(uiLayout *layout, PointerRNA *ptr, PointerRNA *
        box= uiLayoutBox(layout);
        row= uiLayoutRow(box, 0);
        
-       uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", 0);
+       uiItemR(row, ptr, "show_expanded", UI_ITEM_R_NO_BG, "", ICON_NULL);
        if(RNA_boolean_get(ptr, "show_expanded")) {
-               uiItemR(row, ptr, "type", 0, "", 0);
-               uiItemR(row, ptr, "name", 0, "", 0);
+               uiItemR(row, ptr, "type", 0, "", ICON_NULL);
+               uiItemR(row, ptr, "name", 0, "", ICON_NULL);
        } else {
-               uiItemL(row, actuator_name(act->type), 0);
-               uiItemL(row, act->name, 0);
+               uiItemL(row, actuator_name(act->type), ICON_NULL);
+               uiItemL(row, act->name, ICON_NULL);
        }
 
        subrow= uiLayoutRow(row, 0);
        uiLayoutSetActive(subrow, ((RNA_boolean_get(logic_ptr, "show_actuators_active_states")
                                                        && RNA_boolean_get(ptr, "show_expanded")) || RNA_boolean_get(ptr, "pin")));
-       uiItemR(subrow, ptr, "pin", UI_ITEM_R_NO_BG, "", 0);
+       uiItemR(subrow, ptr, "pin", UI_ITEM_R_NO_BG, "", ICON_NULL);
 
        if(RNA_boolean_get(ptr, "show_expanded")==0) {
                subrow= uiLayoutRow(row, 1);
@@ -3654,34 +3654,34 @@ static void draw_actuator_action(uiLayout *layout, PointerRNA *ptr)
        uiLayout *row;
 
        if(ob->type != OB_ARMATURE){
-               uiItemL(layout, "Actuator only available for armatures", 0);
+               uiItemL(layout, "Actuator only available for armatures", ICON_NULL);
                return;
        }
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "play_mode", 0, "", 0);
-       uiItemR(row, ptr, "action", 0, NULL, 0);
-       uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, 0);
+       uiItemR(row, ptr, "play_mode", 0, "", ICON_NULL);
+       uiItemR(row, ptr, "action", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
        if((RNA_enum_get(ptr, "play_mode") == ACT_ACTION_FROM_PROP))
-               uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, 0);
+               uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NULL);
 
        else {
-               uiItemR(row, ptr, "frame_start", 0, NULL, 0);
-               uiItemR(row, ptr, "frame_end", 0, NULL, 0);
+               uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NULL);
+               uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NULL);
        }
 
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "frame_blend_in", 0, NULL, 0);
-       uiItemR(row, ptr, "priority", 0, NULL, 0);
+       uiItemR(row, ptr, "frame_blend_in", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "priority", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
-       uiItemPointerR(layout, ptr, "frame_property", &settings_ptr, "properties", NULL, 0);
+       uiItemPointerR(layout, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NULL);
 
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
-       uiItemR(row, "stride_length", 0, NULL, 0);
+       uiItemR(row, "stride_length", 0, NULL, ICON_NULL);
 #endif
 }
 
@@ -3694,7 +3694,7 @@ static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
        PropertyRNA *bones_prop;
 
        if(ob->type != OB_ARMATURE){
-               uiItemL(layout, "Actuator only available for armatures", 0);
+               uiItemL(layout, "Actuator only available for armatures", ICON_NULL);
                return;
        }
        
@@ -3703,7 +3703,7 @@ static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
                bones_prop = RNA_struct_find_property(&pose_ptr, "bones");
        }
        
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
        
        switch (RNA_enum_get(ptr, "mode"))
        {
@@ -3726,8 +3726,8 @@ static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
                                        uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
                        }
 
-                       uiItemR(layout, ptr, "target", 0, NULL, 0);
-                       uiItemR(layout, ptr, "secondary_target", 0, NULL, 0);
+                       uiItemR(layout, ptr, "target", 0, NULL, ICON_NULL);
+                       uiItemR(layout, ptr, "secondary_target", 0, NULL, ICON_NULL);
                        break;
                case ACT_ARM_SETWEIGHT:
                        if (ob->pose) {
@@ -3737,7 +3737,7 @@ static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
                                        uiItemPointerR(layout, ptr, "constraint", &pchan_ptr, "constraints", NULL, ICON_CONSTRAINT_BONE);
                        }
 
-                       uiItemR(layout, ptr, "weight", 0, NULL, 0);
+                       uiItemR(layout, ptr, "weight", 0, NULL, ICON_NULL);
                        break;
        }
 }
@@ -3745,15 +3745,15 @@ static void draw_actuator_armature(uiLayout *layout, PointerRNA *ptr)
 static void draw_actuator_camera(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *row;
-       uiItemR(layout, ptr, "object", 0, NULL, 0);
+       uiItemR(layout, ptr, "object", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "height", 0, NULL, 0);
-       uiItemR(row, ptr, "axis", 0, NULL, 0);
+       uiItemR(row, ptr, "height", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "axis", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "min", 0, NULL, 0);
-       uiItemR(row, ptr, "max", 0, NULL, 0);
+       uiItemR(row, ptr, "min", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "max", 0, NULL, ICON_NULL);
 }
 
 static void draw_actuator_constraint(uiLayout *layout, PointerRNA *ptr, bContext *C)
@@ -3763,96 +3763,96 @@ static void draw_actuator_constraint(uiLayout *layout, PointerRNA *ptr, bContext
 
        RNA_main_pointer_create(CTX_data_main(C), &main_ptr);
 
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
        switch (RNA_enum_get(ptr, "mode"))
        {
                case ACT_CONST_TYPE_LOC:
-                       uiItemR(layout, ptr, "limit", 0, NULL, 0);
+                       uiItemR(layout, ptr, "limit", 0, NULL, ICON_NULL);
 
                        row = uiLayoutRow(layout, 1);
-                       uiItemR(row, ptr, "limit_min", 0, NULL, 0);
-                       uiItemR(row, ptr, "limit_max", 0, NULL, 0);
+                       uiItemR(row, ptr, "limit_min", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "limit_max", 0, NULL, ICON_NULL);
 
-                       uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                        break;
 
                case ACT_CONST_TYPE_DIST:
                        split = uiLayoutSplit(layout, 0.8, 0);
-                       uiItemR(split, ptr, "direction", 0, NULL, 0);
+                       uiItemR(split, ptr, "direction", 0, NULL, ICON_NULL);
                        row = uiLayoutRow(split, 1);
-                       uiItemR(row, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, 0);
-                       uiItemR(row, ptr, "use_normal", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "use_normal", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                        row = uiLayoutRow(layout, 0);
                        col = uiLayoutColumn(row, 0);
-                       uiItemL(col, "Range:", 0);
-                       uiItemR(col, ptr, "range", 0, "", 0);
+                       uiItemL(col, "Range:", ICON_NULL);
+                       uiItemR(col, ptr, "range", 0, "", ICON_NULL);
 
                        col = uiLayoutColumn(row, 1);
-                       uiItemR(col, ptr, "use_force_distance", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(col, ptr, "use_force_distance", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        subcol = uiLayoutColumn(col, 0);
                        uiLayoutSetActive(subcol, RNA_boolean_get(ptr, "use_force_distance")==1);
-                       uiItemR(subcol, ptr, "distance", 0, "", 0);
+                       uiItemR(subcol, ptr, "distance", 0, "", ICON_NULL);
 
-                       uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER , NULL, 0);
+                       uiItemR(layout, ptr, "damping", UI_ITEM_R_SLIDER , NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.15, 0);
-                       uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        if (RNA_boolean_get(ptr, "use_material_detect"))
                                uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
                        else
-                               uiItemR(split, ptr, "property", 0, NULL, 0);
+                               uiItemR(split, ptr, "property", 0, NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.15, 0);
-                       uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                        row = uiLayoutRow(split, 1);
-                       uiItemR(row, ptr, "time", 0, NULL, 0);
-                       uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(row, ptr, "time", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                        break;
 
                case ACT_CONST_TYPE_ORI:
-                       uiItemR(layout, ptr, "direction_axis", 0, NULL, 0);
+                       uiItemR(layout, ptr, "direction_axis", 0, NULL, ICON_NULL);
 
                        row=uiLayoutRow(layout, 1);
-                       uiItemR(row, ptr, "damping", UI_ITEM_R_SLIDER , NULL, 0);
-                       uiItemR(row, ptr, "time", 0, NULL, 0);
+                       uiItemR(row, ptr, "damping", UI_ITEM_R_SLIDER , NULL, ICON_NULL);
+                       uiItemR(row, ptr, "time", 0, NULL, ICON_NULL);
 
                        row=uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "rotation_max", 0, NULL, 0);
+                       uiItemR(row, ptr, "rotation_max", 0, NULL, ICON_NULL);
 
                        row=uiLayoutRow(layout, 1);
-                       uiItemR(row, ptr, "angle_min", 0, NULL, 0);
-                       uiItemR(row, ptr, "angle_max", 0, NULL, 0);
+                       uiItemR(row, ptr, "angle_min", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "angle_max", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_CONST_TYPE_FH:
                        split=uiLayoutSplit(layout, 0.75, 0);
                        row= uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "fh_damping", UI_ITEM_R_SLIDER , NULL, 0);
+                       uiItemR(row, ptr, "fh_damping", UI_ITEM_R_SLIDER , NULL, ICON_NULL);
 
-                       uiItemR(row, ptr, "fh_height", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_fh_paralel_axis", UI_ITEM_R_TOGGLE , NULL, 0);
+                       uiItemR(row, ptr, "fh_height", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_fh_paralel_axis", UI_ITEM_R_TOGGLE , NULL, ICON_NULL);
 
                        row = uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "direction_axis", 0, NULL, 0);
+                       uiItemR(row, ptr, "direction_axis", 0, NULL, ICON_NULL);
                        split = uiLayoutSplit(row, 0.9, 0);
-                       uiItemR(split, ptr, "spring", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_fh_normal", UI_ITEM_R_TOGGLE , NULL, 0);
+                       uiItemR(split, ptr, "spring", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_fh_normal", UI_ITEM_R_TOGGLE , NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.15, 0);
-                       uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(split, ptr, "use_material_detect", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        if (RNA_boolean_get(ptr, "use_material_detect"))
                                uiItemPointerR(split, ptr, "material", &main_ptr, "materials", NULL, ICON_MATERIAL_DATA);
                        else
-                               uiItemR(split, ptr, "property", 0, NULL, 0);
+                               uiItemR(split, ptr, "property", 0, NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.15, 0);
-                       uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(split, ptr, "use_persistent", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "time", 0, NULL, 0);
-                       uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(row, ptr, "time", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "damping_rotation", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                        break;
        }
 }
@@ -3861,53 +3861,53 @@ static void draw_actuator_edit_object(uiLayout *layout, PointerRNA *ptr)
 {
        Object *ob = (Object *)ptr->id.data;
        uiLayout *row, *split, *subsplit;
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
 
        switch (RNA_enum_get(ptr, "mode"))
        {
                case ACT_EDOB_ADD_OBJECT:
                        row = uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "object", 0, NULL, 0);
-                       uiItemR(row, ptr, "time", 0, NULL, 0);
+                       uiItemR(row, ptr, "object", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "time", 0, NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.9, 0);
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "linear_velocity", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.9, 0);
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "angular_velocity", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "angular_velocity", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        break;
                case ACT_EDOB_END_OBJECT:
                        break;
                case ACT_EDOB_REPLACE_MESH:
                        if(ob->type != OB_MESH) {
-                               uiItemL(layout, "Mode only available for mesh objects", 0);
+                               uiItemL(layout, "Mode only available for mesh objects", ICON_NULL);
                                break;
                        }
                        split = uiLayoutSplit(layout, 0.6, 0);
-                       uiItemR(split, ptr, "mesh", 0, NULL, 0);
+                       uiItemR(split, ptr, "mesh", 0, NULL, ICON_NULL);
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "use_replace_display_mesh", UI_ITEM_R_TOGGLE, NULL, 0);
-                       uiItemR(row, ptr, "use_replace_physics_mesh", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "use_replace_display_mesh", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "use_replace_physics_mesh", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        break;
                case ACT_EDOB_TRACK_TO:
                        split = uiLayoutSplit(layout, 0.5, 0);
-                       uiItemR(split, ptr, "track_object", 0, NULL, 0);
+                       uiItemR(split, ptr, "track_object", 0, NULL, ICON_NULL);
                        subsplit = uiLayoutSplit(split, 0.7, 0);
-                       uiItemR(subsplit, ptr, "time", 0, NULL, 0);
-                       uiItemR(subsplit, ptr, "use_3d_tracking", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(subsplit, ptr, "time", 0, NULL, ICON_NULL);
+                       uiItemR(subsplit, ptr, "use_3d_tracking", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        break;
                case ACT_EDOB_DYNAMICS:
                        if(ob->type != OB_MESH) {
-                               uiItemL(layout, "Mode only available for mesh objects", 0);
+                               uiItemL(layout, "Mode only available for mesh objects", ICON_NULL);
                                break;
                        }
-                       uiItemR(layout, ptr, "dynamic_operation", 0, NULL, 0);
+                       uiItemR(layout, ptr, "dynamic_operation", 0, NULL, ICON_NULL);
                        if (RNA_enum_get(ptr, "dynamic_operation") == ACT_EDOB_SET_MASS)
-                               uiItemR(layout, ptr, "mass", 0, NULL, 0);
+                               uiItemR(layout, ptr, "mass", 0, NULL, ICON_NULL);
                        break;
        }
 }
@@ -3916,31 +3916,31 @@ static void draw_actuator_filter_2d(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *row, *split;
 
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
        switch (RNA_enum_get(ptr, "mode"))
        {
                case ACT_2DFILTER_CUSTOMFILTER:
-                       uiItemR(layout, ptr, "filter_pass", 0, NULL, 0);
-                       uiItemR(layout, ptr, "glsl_shader", 0, NULL, 0);
+                       uiItemR(layout, ptr, "filter_pass", 0, NULL, ICON_NULL);
+                       uiItemR(layout, ptr, "glsl_shader", 0, NULL, ICON_NULL);
                        break;
                case ACT_2DFILTER_MOTIONBLUR:
                        split=uiLayoutSplit(layout, 0.75, 1);
                        row= uiLayoutRow(split, 0);
                        uiLayoutSetActive(row, RNA_boolean_get(ptr, "use_motion_blur")==1);
-                       uiItemR(row, ptr, "motion_blur_factor", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_motion_blur", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "motion_blur_factor", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_motion_blur", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        break;
                default: // all other 2D Filters
-                       uiItemR(layout, ptr, "filter_pass", 0, NULL, 0);
+                       uiItemR(layout, ptr, "filter_pass", 0, NULL, ICON_NULL);
                        break;
        }
 }
 
 static void draw_actuator_game(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
        if (RNA_enum_get(ptr, "mode") == ACT_GAME_LOAD)
-               uiItemR(layout, ptr, "filename", 0, NULL, 0);
+               uiItemR(layout, ptr, "filename", 0, NULL, ICON_NULL);
 }
 
 static void draw_actuator_ipo(uiLayout *layout, PointerRNA *ptr)
@@ -3953,27 +3953,27 @@ static void draw_actuator_ipo(uiLayout *layout, PointerRNA *ptr)
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "play_type", 0, "", 0);
+       uiItemR(row, ptr, "play_type", 0, "", ICON_NULL);
        subrow= uiLayoutRow(row, 1);
-       uiItemR(subrow, ptr, "use_force", UI_ITEM_R_TOGGLE, NULL, 0);
-       uiItemR(subrow, ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, 0);
+       uiItemR(subrow, ptr, "use_force", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+       uiItemR(subrow, ptr, "use_additive", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
        col = uiLayoutColumn(subrow, 0);
        uiLayoutSetActive(col, (RNA_boolean_get(ptr, "use_additive") || RNA_boolean_get(ptr, "use_force")));
-       uiItemR(col, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, 0);
+       uiItemR(col, ptr, "use_local", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
        if((RNA_enum_get(ptr, "play_type") == ACT_IPO_FROM_PROP))
-               uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, 0);
+               uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NULL);
 
        else {
-               uiItemR(row, ptr, "frame_start", 0, NULL, 0);
-               uiItemR(row, ptr, "frame_end", 0, NULL, 0);
+               uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NULL);
+               uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NULL);
        }
-       uiItemR(row, ptr, "apply_to_children", 0, NULL, 0);
+       uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
-       uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties", NULL, 0);
+       uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NULL);
 }
 
 static void draw_actuator_message(uiLayout *layout, PointerRNA *ptr, bContext *C)
@@ -3988,15 +3988,15 @@ static void draw_actuator_message(uiLayout *layout, PointerRNA *ptr, bContext *C
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
        uiItemPointerR(layout, ptr, "to_property", &main_ptr, "objects", NULL, ICON_OBJECT_DATA);
-       uiItemR(layout, ptr, "subject", 0, NULL, 0);
+       uiItemR(layout, ptr, "subject", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "body_type", 0, NULL, 0);
+       uiItemR(row, ptr, "body_type", 0, NULL, ICON_NULL);
 
        if(RNA_enum_get(ptr, "body_type") == ACT_MESG_MESG)
-               uiItemR(row, ptr, "body_message", 0, "", 0);
+               uiItemR(row, ptr, "body_message", 0, "", ICON_NULL);
        else // mode == ACT_MESG_PROP
-               uiItemPointerR(row, ptr, "body_property", &settings_ptr, "properties", "", 0);
+               uiItemPointerR(row, ptr, "body_property", &settings_ptr, "properties", "", ICON_NULL);
 }
 
 static void draw_actuator_motion(uiLayout *layout, PointerRNA *ptr)
@@ -4010,85 +4010,85 @@ static void draw_actuator_motion(uiLayout *layout, PointerRNA *ptr)
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
        physics_type = RNA_enum_get(&settings_ptr, "physics_type");
        
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
        
        switch (RNA_enum_get(ptr, "mode")) {
                case ACT_OBJECT_NORMAL:
                        split = uiLayoutSplit(layout, 0.9, 0);
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "offset_location", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_local_location", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "offset_location", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_local_location", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.9, 0);
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "offset_rotation", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_local_rotation", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "offset_rotation", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_local_rotation", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        
                        if (ELEM3(physics_type, OB_BODY_TYPE_DYNAMIC, OB_BODY_TYPE_RIGID, OB_BODY_TYPE_SOFT)) {                 
-                               uiItemL(layout, "Dynamic Object Settings:", 0);
+                               uiItemL(layout, "Dynamic Object Settings:", ICON_NULL);
                                split = uiLayoutSplit(layout, 0.9, 0);
                                row = uiLayoutRow(split, 0);
-                               uiItemR(row, ptr, "force", 0, NULL, 0);
-                               uiItemR(split, ptr, "use_local_force", UI_ITEM_R_TOGGLE, NULL, 0);
+                               uiItemR(row, ptr, "force", 0, NULL, ICON_NULL);
+                               uiItemR(split, ptr, "use_local_force", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                                split = uiLayoutSplit(layout, 0.9, 0);
                                row = uiLayoutRow(split, 0);
-                               uiItemR(row, ptr, "torque", 0, NULL, 0);
-                               uiItemR(split, ptr, "use_local_torque", UI_ITEM_R_TOGGLE, NULL, 0);
+                               uiItemR(row, ptr, "torque", 0, NULL, ICON_NULL);
+                               uiItemR(split, ptr, "use_local_torque", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                                split = uiLayoutSplit(layout, 0.9, 0);
                                row = uiLayoutRow(split, 0);
-                               uiItemR(row, ptr, "linear_velocity", 0, NULL, 0);
+                               uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NULL);
                                row = uiLayoutRow(split, 1);
-                               uiItemR(row, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, 0);
-                               uiItemR(row, ptr, "use_add_linear_velocity", UI_ITEM_R_TOGGLE, NULL, 0);
+                               uiItemR(row, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+                               uiItemR(row, ptr, "use_add_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                                split = uiLayoutSplit(layout, 0.9, 0);
                                row = uiLayoutRow(split, 0);
-                               uiItemR(row, ptr, "angular_velocity", 0, NULL, 0);
-                               uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, 0);
+                               uiItemR(row, ptr, "angular_velocity", 0, NULL, ICON_NULL);
+                               uiItemR(split, ptr, "use_local_angular_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
-                               uiItemR(layout, ptr, "damping", 0, NULL, 0);
+                               uiItemR(layout, ptr, "damping", 0, NULL, ICON_NULL);
                        }
                        break;
                case ACT_OBJECT_SERVO:
-                       uiItemR(layout, ptr, "reference_object", 0, NULL, 0);
+                       uiItemR(layout, ptr, "reference_object", 0, NULL, ICON_NULL);
 
                        split = uiLayoutSplit(layout, 0.9, 0);
                        row = uiLayoutRow(split, 0);
-                       uiItemR(row, ptr, "linear_velocity", 0, NULL, 0);
-                       uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "linear_velocity", 0, NULL, ICON_NULL);
+                       uiItemR(split, ptr, "use_local_linear_velocity", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
 
                        row = uiLayoutRow(layout, 0);
                        col = uiLayoutColumn(row, 0);
-                       uiItemR(col, ptr, "use_servo_limit_x", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(col, ptr, "use_servo_limit_x", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        subcol = uiLayoutColumn(col, 1);
                        uiLayoutSetActive(subcol, RNA_boolean_get(ptr, "use_servo_limit_x")==1);
-                       uiItemR(subcol, ptr, "force_max_x", 0, NULL, 0);
-                       uiItemR(subcol, ptr, "force_min_x", 0, NULL, 0);
+                       uiItemR(subcol, ptr, "force_max_x", 0, NULL, ICON_NULL);
+                       uiItemR(subcol, ptr, "force_min_x", 0, NULL, ICON_NULL);
 
                        col = uiLayoutColumn(row, 0);
-                       uiItemR(col, ptr, "use_servo_limit_y", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(col, ptr, "use_servo_limit_y", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        subcol = uiLayoutColumn(col, 1);
                        uiLayoutSetActive(subcol, RNA_boolean_get(ptr, "use_servo_limit_y")==1);
-                       uiItemR(subcol, ptr, "force_max_y", 0, NULL, 0);
-                       uiItemR(subcol, ptr, "force_min_y", 0, NULL, 0);
+                       uiItemR(subcol, ptr, "force_max_y", 0, NULL, ICON_NULL);
+                       uiItemR(subcol, ptr, "force_min_y", 0, NULL, ICON_NULL);
 
                        col = uiLayoutColumn(row, 0);
-                       uiItemR(col, ptr, "use_servo_limit_z", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(col, ptr, "use_servo_limit_z", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        subcol = uiLayoutColumn(col, 1);
                        uiLayoutSetActive(subcol, RNA_boolean_get(ptr, "use_servo_limit_z")==1);
-                       uiItemR(subcol, ptr, "force_max_z", 0, NULL, 0);
-                       uiItemR(subcol, ptr, "force_min_z", 0, NULL, 0);
+                       uiItemR(subcol, ptr, "force_max_z", 0, NULL, ICON_NULL);
+                       uiItemR(subcol, ptr, "force_min_z", 0, NULL, ICON_NULL);
 
                        //XXXACTUATOR missing labels from original 2.49 ui (e.g. Servo, Min, Max, Fast)
                        //Layout designers willing to help on that, please compare with 2.49 ui
                        // (since the old code is going to be deleted ... soon)
 
                        col = uiLayoutColumn(layout, 1);
-                       uiItemR(col, ptr, "proportional_coefficient", UI_ITEM_R_SLIDER, NULL, 0);
-                       uiItemR(col, ptr, "integral_coefficient", UI_ITEM_R_SLIDER, NULL, 0);
-                       uiItemR(col, ptr, "derivate_coefficient", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(col, ptr, "proportional_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+                       uiItemR(col, ptr, "integral_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+                       uiItemR(col, ptr, "derivate_coefficient", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                        break;
        }
 }
@@ -4097,12 +4097,12 @@ static void draw_actuator_parent(uiLayout *layout, PointerRNA *ptr)
 {
        uiLayout *row;
 
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
-       uiItemR(layout, ptr, "object", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "object", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "use_compound", 0, NULL, 0);
-       uiItemR(row, ptr, "use_ghost", 0, NULL, 0);
+       uiItemR(row, ptr, "use_compound", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_ghost", 0, NULL, ICON_NULL);
 }
 
 static void draw_actuator_property(uiLayout *layout, PointerRNA *ptr)
@@ -4117,30 +4117,30 @@ static void draw_actuator_property(uiLayout *layout, PointerRNA *ptr)
 
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
-       uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
+       uiItemPointerR(layout, ptr, "property", &settings_ptr, "properties", NULL, ICON_NULL);
 
        switch(RNA_enum_get(ptr, "mode"))
        {
                case ACT_PROP_TOGGLE:
                        break;
                case ACT_PROP_ADD:
-                       uiItemR(layout, ptr, "value", 0, NULL, 0);
+                       uiItemR(layout, ptr, "value", 0, NULL, ICON_NULL);
                        break;
                case ACT_PROP_ASSIGN:
-                       uiItemR(layout, ptr, "value", 0, NULL, 0);
+                       uiItemR(layout, ptr, "value", 0, NULL, ICON_NULL);
                        break;
                case ACT_PROP_COPY:
                        row = uiLayoutRow(layout, 0);
-                       uiItemR(row, ptr, "object", 0, NULL, 0);
+                       uiItemR(row, ptr, "object", 0, NULL, ICON_NULL);
                        if(ob_from){
                                RNA_pointer_create((ID *)ob_from, &RNA_GameObjectSettings, ob_from, &obj_settings_ptr);
-                               uiItemPointerR(row, ptr, "object_property", &obj_settings_ptr, "properties", NULL, 0);
+                               uiItemPointerR(row, ptr, "object_property", &obj_settings_ptr, "properties", NULL, ICON_NULL);
                        }else
                        {
                                subrow= uiLayoutRow(row, 0);
                                uiLayoutSetActive(subrow, 0);
-                               uiItemR(subrow, ptr, "object_property", 0, NULL, 0);
+                               uiItemR(subrow, ptr, "object_property", 0, NULL, ICON_NULL);
                        }
                        break;
        }
@@ -4157,72 +4157,72 @@ static void draw_actuator_random(uiLayout *layout, PointerRNA *ptr)
 
        row = uiLayoutRow(layout, 0);
 
-       uiItemR(row, ptr, "seed", 0, NULL, 0);
-       uiItemR(row, ptr, "distribution", 0, NULL, 0);
+       uiItemR(row, ptr, "seed", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "distribution", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(layout, 0);
-       uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, 0);
+       uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NULL);
 
        row = uiLayoutRow(layout, 0);
 
        switch (RNA_enum_get(ptr, "distribution")){
                case ACT_RANDOM_BOOL_CONST:
-                       uiItemR(row, ptr, "use_always_true", UI_ITEM_R_TOGGLE, NULL, 0);
+                       uiItemR(row, ptr, "use_always_true", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_BOOL_UNIFORM:
-                       uiItemL(row, "Choose between true and false, 50% chance each", 0);
+                       uiItemL(row, "Choose between true and false, 50% chance each", ICON_NULL);
                        break;
 
                case ACT_RANDOM_BOOL_BERNOUILLI:
-                       uiItemR(row, ptr, "chance", 0, NULL, 0);
+                       uiItemR(row, ptr, "chance", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_INT_CONST:
-                       uiItemR(row, ptr, "int_value", 0, NULL, 0);
+                       uiItemR(row, ptr, "int_value", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_INT_UNIFORM:
-                       uiItemR(row, ptr, "int_min", 0, NULL, 0);
-                       uiItemR(row, ptr, "int_max", 0, NULL, 0);
+                       uiItemR(row, ptr, "int_min", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "int_max", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_INT_POISSON:
-                       uiItemR(row, ptr, "int_mean", 0, NULL, 0);
+                       uiItemR(row, ptr, "int_mean", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_FLOAT_CONST:
-                       uiItemR(row, ptr, "float_value", 0, NULL, 0);
+                       uiItemR(row, ptr, "float_value", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_FLOAT_UNIFORM:
-                       uiItemR(row, ptr, "float_min", 0, NULL, 0);
-                       uiItemR(row, ptr, "float_max", 0, NULL, 0);
+                       uiItemR(row, ptr, "float_min", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "float_max", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_FLOAT_NORMAL:
-                       uiItemR(row, ptr, "float_mean", 0, NULL, 0);
-                       uiItemR(row, ptr, "standard_derivation", 0, NULL, 0);
+                       uiItemR(row, ptr, "float_mean", 0, NULL, ICON_NULL);
+                       uiItemR(row, ptr, "standard_derivation", 0, NULL, ICON_NULL);
                        break;
 
                case ACT_RANDOM_FLOAT_NEGATIVE_EXPONENTIAL:
-                       uiItemR(row, ptr, "half_life_time", 0, NULL, 0);
+                       uiItemR(row, ptr, "half_life_time", 0, NULL, ICON_NULL);
                        break;
        }
 }
 
 static void draw_actuator_scene(uiLayout *layout, PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
 
        switch (RNA_enum_get(ptr, "mode")) {
                case ACT_SCENE_CAMERA:
-                       uiItemR(layout, ptr, "camera", 0, NULL, 0);
+                       uiItemR(layout, ptr, "camera", 0, NULL, ICON_NULL);
                        break;
                case ACT_SCENE_RESTART:
                        break;
                default: // ACT_SCENE_SET|ACT_SCENE_ADD_FRONT|ACT_SCENE_ADD_BACK|ACT_SCENE_REMOVE|ACT_SCENE_SUSPEND|ACT_SCENE_RESUME
-                       uiItemR(layout, ptr, "scene", 0, NULL, 0);
+                       uiItemR(layout, ptr, "scene", 0, NULL, ICON_NULL);
                        break;
        }
 }
@@ -4234,35 +4234,35 @@ static void draw_actuator_shape_action(uiLayout *layout, PointerRNA *ptr)
        uiLayout *row;
 
        if(ob->type != OB_MESH){
-               uiItemL(layout, "Actuator only available for mesh objects", 0);
+               uiItemL(layout, "Actuator only available for mesh objects", ICON_NULL);
                return;
        }
 
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "mode", 0, "", 0);
-       uiItemR(row, ptr, "action", 0, NULL, 0);
-       uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, 0);
+       uiItemR(row, ptr, "mode", 0, "", ICON_NULL);
+       uiItemR(row, ptr, "action", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_continue_last_frame", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
        if((RNA_enum_get(ptr, "mode") == ACT_ACTION_FROM_PROP))
-               uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, 0);
+               uiItemPointerR(row, ptr, "property", &settings_ptr, "properties", NULL, ICON_NULL);
 
        else {
-               uiItemR(row, ptr, "frame_start", 0, NULL, 0);
-               uiItemR(row, ptr, "frame_end", 0, NULL, 0);
+               uiItemR(row, ptr, "frame_start", 0, NULL, ICON_NULL);
+               uiItemR(row, ptr, "frame_end", 0, NULL, ICON_NULL);
        }
 
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "frame_blend_in", 0, NULL, 0);
-       uiItemR(row, ptr, "priority", 0, NULL, 0);
+       uiItemR(row, ptr, "frame_blend_in", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "priority", 0, NULL, ICON_NULL);
 
        row= uiLayoutRow(layout, 0);
-       uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties", NULL, 0);
+       uiItemPointerR(row, ptr, "frame_property", &settings_ptr, "properties", NULL, ICON_NULL);
 
 #ifdef __NLA_ACTION_BY_MOTION_ACTUATOR
-       uiItemR(row, "stride_length", 0, NULL, 0);
+       uiItemR(row, "stride_length", 0, NULL, ICON_NULL);
 #endif
 }
 
@@ -4273,35 +4273,35 @@ static void draw_actuator_sound(uiLayout *layout, PointerRNA *ptr, bContext *C)
        uiTemplateID(layout, C, ptr, "sound", NULL, "SOUND_OT_open", NULL);
        if (!RNA_pointer_get(ptr, "sound").data)
        {
-               uiItemL(layout, "Select a sound from the list or load a new one", 0);
+               uiItemL(layout, "Select a sound from the list or load a new one", ICON_NULL);
                return;
        }
-       uiItemR(layout, ptr, "mode", 0, NULL, 0);
+       uiItemR(layout, ptr, "mode", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "volume", 0, NULL, 0);
-       uiItemR(row, ptr, "pitch", 0, NULL, 0);
+       uiItemR(row, ptr, "volume", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "pitch", 0, NULL, ICON_NULL);
 
-       uiItemR(layout, ptr, "use_sound_3d", 0, NULL, 0);
+       uiItemR(layout, ptr, "use_sound_3d", 0, NULL, ICON_NULL);
        
        col = uiLayoutColumn(layout, 0);
        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_sound_3d")==1);
 
        row = uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "gain_3d_min", 0, NULL, 0);
-       uiItemR(row, ptr, "gain_3d_max", 0, NULL, 0);
+       uiItemR(row, ptr, "gain_3d_min", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "gain_3d_max", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "distance_3d_reference", 0, NULL, 0);
-       uiItemR(row, ptr, "distance_3d_max", 0, NULL, 0);
+       uiItemR(row, ptr, "distance_3d_reference", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "distance_3d_max", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "rolloff_factor_3d", 0, NULL, 0);
-       uiItemR(row, ptr, "cone_outer_gain_3d", 0, NULL, 0);
+       uiItemR(row, ptr, "rolloff_factor_3d", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "cone_outer_gain_3d", 0, NULL, ICON_NULL);
 
        row = uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "cone_outer_angle_3d", 0, NULL, 0);
-       uiItemR(row, ptr, "cone_inner_angle_3d", 0, NULL, 0);
+       uiItemR(row, ptr, "cone_outer_angle_3d", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "cone_inner_angle_3d", 0, NULL, ICON_NULL);
 }
 
 static void draw_actuator_state(uiLayout *layout, PointerRNA *ptr)
@@ -4312,7 +4312,7 @@ static void draw_actuator_state(uiLayout *layout, PointerRNA *ptr)
        RNA_pointer_create((ID *)ob, &RNA_GameObjectSettings, ob, &settings_ptr);
 
        split = uiLayoutSplit(layout, 0.35, 0);
-       uiItemR(split, ptr, "operation", 0, NULL, 0);
+       uiItemR(split, ptr, "operation", 0, NULL, ICON_NULL);
 
        uiTemplateLayers(split, ptr, "states", &settings_ptr, "used_states", 0);
 }
@@ -4322,9 +4322,9 @@ static void draw_actuator_visibility(uiLayout *layout, PointerRNA *ptr)
        uiLayout *row;
        row = uiLayoutRow(layout, 0);
 
-       uiItemR(row, ptr, "use_visible", 0, NULL, 0);
-       uiItemR(row, ptr, "use_occlusion", 0, NULL, 0);
-       uiItemR(row, ptr, "apply_to_children", 0, NULL, 0);
+       uiItemR(row, ptr, "use_visible", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "use_occlusion", 0, NULL, ICON_NULL);
+       uiItemR(row, ptr, "apply_to_children", 0, NULL, ICON_NULL);
 }
 
 void draw_brick_actuator(uiLayout *layout, PointerRNA *ptr, bContext *C)
@@ -4468,9 +4468,9 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
        
        uiDefBlockBut(block, controller_menu, NULL, "Controllers", xco-10, yco, 300, UI_UNIT_Y, "");            /* replace this with uiLayout stuff later */
        
-       uiItemR(row, &logic_ptr, "show_controllers_selected_objects", 0, "Sel", 0);
-       uiItemR(row, &logic_ptr, "show_controllers_active_object", 0, "Act", 0);
-       uiItemR(row, &logic_ptr, "show_controllers_linked_controller", 0, "Link", 0);
+       uiItemR(row, &logic_ptr, "show_controllers_selected_objects", 0, "Sel", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_controllers_active_object", 0, "Act", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_controllers_linked_controller", 0, "Link", ICON_NULL);
 
        for(a=0; a<count; a++) {
                bController *cont;
@@ -4493,7 +4493,7 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
                row = uiLayoutRow(split, 1);
                uiDefButBitS(block, TOG, OB_SHOWCONT, B_REDR, ob->id.name+2,(short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide controllers");
                if (ob == act_ob)
-                       uiItemMenuEnumO(row, "LOGIC_OT_controller_add", "type", "Add Controller", 0);
+                       uiItemMenuEnumO(row, "LOGIC_OT_controller_add", "type", "Add Controller", ICON_NULL);
 
                if (RNA_boolean_get(&settings_ptr, "show_state_panel")) {
 
@@ -4501,8 +4501,8 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
                        split= uiLayoutSplit(box, 0.2, 0);
 
                        col= uiLayoutColumn(split, 0);
-                       uiItemL(col, "Visible", 0);
-                       uiItemL(col, "Initial", 0);
+                       uiItemL(col, "Visible", ICON_NULL);
+                       uiItemL(col, "Initial", ICON_NULL);
 
                        subsplit= uiLayoutSplit(split, 0.85, 0);
                        col= uiLayoutColumn(subsplit, 0);
@@ -4513,8 +4513,8 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
                        uiTemplateLayers(row, &settings_ptr, "states_initial", &settings_ptr, "used_states", 0);
 
                        col= uiLayoutColumn(subsplit, 0);
-                       uiItemR(col, &settings_ptr, "use_all_states", UI_ITEM_R_TOGGLE, NULL, 0);
-                       uiItemR(col, &settings_ptr, "show_debug_state", 0, "", 0); 
+                       uiItemR(col, &settings_ptr, "use_all_states", UI_ITEM_R_TOGGLE, NULL, ICON_NULL);
+                       uiItemR(col, &settings_ptr, "show_debug_state", 0, "", ICON_NULL);
                }
 
                /* End of Drawing the Controller Header common to all Selected Objects */
@@ -4571,10 +4571,10 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
        
        uiDefBlockBut(block, sensor_menu, NULL, "Sensors", xco-10, yco, 300, UI_UNIT_Y, "");            /* replace this with uiLayout stuff later */
        
-       uiItemR(row, &logic_ptr, "show_sensors_selected_objects", 0, "Sel", 0);
-       uiItemR(row, &logic_ptr, "show_sensors_active_object", 0, "Act", 0);
-       uiItemR(row, &logic_ptr, "show_sensors_linked_controller", 0, "Link", 0);
-       uiItemR(row, &logic_ptr, "show_sensors_active_states", 0, "State", 0);
+       uiItemR(row, &logic_ptr, "show_sensors_selected_objects", 0, "Sel", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_sensors_active_object", 0, "Act", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_sensors_linked_controller", 0, "Link", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_sensors_active_states", 0, "State", ICON_NULL);
        
        for(a=0; a<count; a++) {
                bSensor *sens;
@@ -4588,7 +4588,7 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
                row = uiLayoutRow(layout, 1);
                uiDefButBitS(block, TOG, OB_SHOWSENS, B_REDR, ob->id.name+2,(short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide sensors");
                if (ob == act_ob)
-                       uiItemMenuEnumO(row, "LOGIC_OT_sensor_add", "type", "Add Sensor", 0);
+                       uiItemMenuEnumO(row, "LOGIC_OT_sensor_add", "type", "Add Sensor", ICON_NULL);
                
                if ((ob->scaflag & OB_SHOWSENS) == 0) continue;
                
@@ -4637,10 +4637,10 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
        
        uiDefBlockBut(block, actuator_menu, NULL, "Actuators", xco-10, yco, 300, UI_UNIT_Y, "");                /* replace this with uiLayout stuff later */
        
-       uiItemR(row, &logic_ptr, "show_actuators_selected_objects", 0, "Sel", 0);
-       uiItemR(row, &logic_ptr, "show_actuators_active_object", 0, "Act", 0);
-       uiItemR(row, &logic_ptr, "show_actuators_linked_controller", 0, "Link", 0);
-       uiItemR(row, &logic_ptr, "show_actuators_active_states", 0, "State", 0);
+       uiItemR(row, &logic_ptr, "show_actuators_selected_objects", 0, "Sel", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_actuators_active_object", 0, "Act", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_actuators_linked_controller", 0, "Link", ICON_NULL);
+       uiItemR(row, &logic_ptr, "show_actuators_active_states", 0, "State", ICON_NULL);
        
        for(a=0; a<count; a++) {
                bActuator *act;
@@ -4654,7 +4654,7 @@ static void logic_buttons_new(bContext *C, ARegion *ar)
                row = uiLayoutRow(layout, 1);
                uiDefButBitS(block, TOG, OB_SHOWACT, B_REDR, ob->id.name+2,(short)(xco-10), yco, (short)(width-30), UI_UNIT_Y, &ob->scaflag, 0, 31, 0, 0, "Object name, click to show/hide actuators");
                if (ob == act_ob)
-                       uiItemMenuEnumO(row, "LOGIC_OT_actuator_add", "type", "Add Actuator", 0);
+                       uiItemMenuEnumO(row, "LOGIC_OT_actuator_add", "type", "Add Actuator", ICON_NULL);
 
                if ((ob->scaflag & OB_SHOWACT) == 0) continue;
                
index 957bf00..baab6ab 100644 (file)
@@ -230,15 +230,15 @@ static void nla_panel_animdata (const bContext *C, Panel *pa)
        
        /* extrapolation */
        row= uiLayoutRow(layout, 1);
-               uiItemR(row, &adt_ptr, "action_extrapolation", 0, NULL, 0);
+               uiItemR(row, &adt_ptr, "action_extrapolation", 0, NULL, ICON_NULL);
        
        /* blending */
        row= uiLayoutRow(layout, 1);
-               uiItemR(row, &adt_ptr, "action_blend_type", 0, NULL, 0);        
+               uiItemR(row, &adt_ptr, "action_blend_type", 0, NULL, ICON_NULL);
                
        /* influence */
        row= uiLayoutRow(layout, 1);
-               uiItemR(row, &adt_ptr, "action_influence", 0, NULL, 0);
+               uiItemR(row, &adt_ptr, "action_influence", 0, NULL, ICON_NULL);
 }
 
 /* active NLA-Track */
@@ -279,40 +279,40 @@ static void nla_panel_properties(const bContext *C, Panel *pa)
        /* strip type */
        row= uiLayoutColumn(layout, 1);
                uiItemR(row, &strip_ptr, "name", 0, NULL, ICON_NLA); // XXX icon?
-               uiItemR(row, &strip_ptr, "type", 0, NULL, 0);
+               uiItemR(row, &strip_ptr, "type", 0, NULL, ICON_NULL);
        
        /* strip extents */
        column= uiLayoutColumn(layout, 1);
-               uiItemL(column, "Strip Extents:", 0);
-               uiItemR(column, &strip_ptr, "frame_start", 0, NULL, 0);
-               uiItemR(column, &strip_ptr, "frame_end", 0, NULL, 0);
+               uiItemL(column, "Strip Extents:", ICON_NULL);
+               uiItemR(column, &strip_ptr, "frame_start", 0, NULL, ICON_NULL);
+               uiItemR(column, &strip_ptr, "frame_end", 0, NULL, ICON_NULL);
        
        /* extrapolation */
        row= uiLayoutRow(layout, 1);
-               uiItemR(row, &strip_ptr, "extrapolation", 0, NULL, 0);
+               uiItemR(row, &strip_ptr, "extrapolation", 0, NULL, ICON_NULL);
        
        /* blending */
        row= uiLayoutRow(layout, 1);
-               uiItemR(row, &strip_ptr, "blend_type", 0, NULL, 0);
+               uiItemR(row, &strip_ptr, "blend_type", 0, NULL, ICON_NULL);
                
        /* blend in/out + autoblending
         *      - blend in/out can only be set when autoblending is off
         */
        column= uiLayoutColumn(layout, 1);
                uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_influence")==0); 
-               uiItemR(column, &strip_ptr, "use_auto_blend", 0, NULL, 0); // XXX as toggle?
+               uiItemR(column, &strip_ptr, "use_auto_blend", 0, NULL, ICON_NULL); // XXX as toggle?
                
                subcol= uiLayoutColumn(column, 1);
                        uiLayoutSetActive(subcol, RNA_boolean_get(&strip_ptr, "use_auto_blend")==0); 
-                       uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, 0);
-                       uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, 0);
+                       uiItemR(subcol, &strip_ptr, "blend_in", 0, NULL, ICON_NULL);
+                       uiItemR(subcol, &strip_ptr, "blend_out", 0, NULL, ICON_NULL);
                
        /* settings */
        column= uiLayoutColumn(layout, 1);
                uiLayoutSetActive(column, !(RNA_boolean_get(&strip_ptr, "use_animated_influence") || RNA_boolean_get(&strip_ptr, "use_animated_time"))); 
-               uiItemL(column, "Playback Settings:", 0);
-               uiItemR(column, &strip_ptr, "mute", 0, NULL, 0);
-               uiItemR(column, &strip_ptr, "use_reverse", 0, NULL, 0);
+               uiItemL(column, "Playback Settings:", ICON_NULL);
+               uiItemR(column, &strip_ptr, "mute", 0, NULL, ICON_NULL);
+               uiItemR(column, &strip_ptr, "use_reverse", 0, NULL, ICON_NULL);
 }
 
 
@@ -339,17 +339,17 @@ static void nla_panel_actclip(const bContext *C, Panel *pa)
        /* action extents */
        // XXX custom names were used here (to avoid the prefixes)... probably not necessary in future?
        column= uiLayoutColumn(layout, 1);
-               uiItemL(column, "Action Extents:", 0);
-               uiItemR(column, &strip_ptr, "action_frame_start", 0, "Start Frame", 0);
-               uiItemR(column, &strip_ptr, "action_frame_end", 0, "End Frame", 0);
-               uiItemO(column, NULL, 0, "NLA_OT_action_sync_length");
+               uiItemL(column, "Action Extents:", ICON_NULL);
+               uiItemR(column, &strip_ptr, "action_frame_start", 0, "Start Frame", ICON_NULL);
+               uiItemR(column, &strip_ptr, "action_frame_end", 0, "End Frame", ICON_NULL);
+               uiItemO(column, NULL, ICON_NULL, "NLA_OT_action_sync_length");
                
        /* action usage */
        column= uiLayoutColumn(layout, 1);
                uiLayoutSetActive(column, RNA_boolean_get(&strip_ptr, "use_animated_time")==0); 
-               uiItemL(column, "Playback Settings:", 0);
-               uiItemR(column, &strip_ptr, "scale", 0, NULL, 0);
-               uiItemR(column, &strip_ptr, "repeat", 0, NULL, 0);
+               uiItemL(column, "Playback Settings:", ICON_NULL);
+               uiItemR(column, &strip_ptr, "scale", 0, NULL, ICON_NULL);
+               uiItemR(column, &strip_ptr, "repeat", 0, NULL, ICON_NULL);
 }
 
 /* evaluation settings for active NLA-Strip */
@@ -368,22 +368,22 @@ static void nla_panel_evaluation(const bContext *C, Panel *pa)
        uiBlockSetHandleFunc(block, do_nla_region_buttons, NULL);
                
        column= uiLayoutColumn(layout, 1);
-               uiItemR(column, &strip_ptr, "use_animated_influence", 0, NULL, 0);
+               uiItemR(column, &strip_ptr, "use_animated_influence", 0, NULL, ICON_NULL);
                
                subcolumn= uiLayoutColumn(column, 1);
                uiLayoutSetEnabled(subcolumn, RNA_boolean_get(&strip_ptr, "use_animated_influence"));   
-                       uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, 0);
+                       uiItemR(subcolumn, &strip_ptr, "influence", 0, NULL, ICON_NULL);
                
        
        column= uiLayoutColumn(layout, 1);
                subrow= uiLayoutRow(column, 0);
-               uiItemR(subrow, &strip_ptr, "use_animated_time", 0, NULL, 0);
-               uiItemR(subrow, &strip_ptr, "use_animated_time_cyclic", 0, NULL, 0);
+               uiItemR(subrow, &strip_ptr, "use_animated_time", 0, NULL, ICON_NULL);
+               uiItemR(subrow, &strip_ptr, "use_animated_time_cyclic", 0, NULL, ICON_NULL);
 
                subcolumn= uiLayoutColumn(column, 1);
                subrow= uiLayoutRow(subcolumn, 0);
                uiLayoutSetEnabled(subrow, RNA_boolean_get(&strip_ptr, "use_animated_time"));
-                       uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, 0);
+                       uiItemR(subcolumn, &strip_ptr, "strip_time", 0, NULL, ICON_NULL);
 }
 
 /* F-Modifiers for active NLA-Strip */
index 279c8c5..e04ef99 100644 (file)
@@ -1549,7 +1549,7 @@ static int nla_fmodifier_add_invoke (bContext *C, wmOperator *UNUSED(op), wmEven
        uiLayout *layout;
        int i;
        
-       pup= uiPupMenuBegin(C, "Add F-Modifier", 0);
+       pup= uiPupMenuBegin(C, "Add F-Modifier", ICON_NULL);
        layout= uiPupMenuLayout(pup);
        
        /* start from 1 to skip the 'Invalid' modifier type */
index 75eaa1d..5ee2b17 100644 (file)
@@ -88,7 +88,7 @@ static void node_buts_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *p
        prop = RNA_struct_find_property(ptr, "outputs");
        RNA_property_collection_lookup_int(ptr, prop, 0, &sockptr);
        
-       uiItemR(layout, &sockptr, "default_value", 0, "", 0);
+       uiItemR(layout, &sockptr, "default_value", 0, "", ICON_NULL);
 }
 
 static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -103,7 +103,7 @@ static void node_buts_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr
        
        col = uiLayoutColumn(layout, 0);
        uiTemplateColorWheel(col, &sockptr, "default_value", 1, 0, 0, 0);
-       uiItemR(col, &sockptr, "default_value", 0, "", 0);
+       uiItemR(col, &sockptr, "default_value", 0, "", ICON_NULL);
 }
 
 static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -113,7 +113,7 @@ static void node_buts_mix_rgb(uiLayout *layout, bContext *UNUSED(C), PointerRNA
        bNodeTree *ntree= (bNodeTree*)ptr->id.data;
 
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "blend_type", 0, "", 0);
+       uiItemR(row, ptr, "blend_type", 0, "", ICON_NULL);
        if(ntree->type == NTREE_COMPOSIT)
                uiItemR(row, ptr, "use_alpha", 0, "", ICON_IMAGE_RGB_ALPHA);
 }
@@ -136,8 +136,8 @@ static void node_buts_time(uiLayout *layout, bContext *UNUSED(C), PointerRNA *pt
        uiTemplateCurveMapping(layout, ptr, "curve", 's', 0, 0);
 
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "frame_start", 0, "Sta", 0);
-       uiItemR(row, ptr, "frame_end", 0, "End", 0);
+       uiItemR(row, ptr, "frame_start", 0, "Sta", ICON_NULL);
+       uiItemR(row, ptr, "frame_end", 0, "End", ICON_NULL);
 }
 
 static void node_buts_colorramp(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -268,17 +268,17 @@ static void node_buts_texture(uiLayout *layout, bContext *UNUSED(C), PointerRNA
                (node->type != TEX_NODE_TEXTURE)
        );
        
-       uiItemR(layout, ptr, "texture", 0, "", 0);
+       uiItemR(layout, ptr, "texture", 0, "", ICON_NULL);
        
        if(multi) {
                /* Number Drawing not optimal here, better have a list*/
-               uiItemR(layout, ptr, "node_output", 0, "", 0);
+               uiItemR(layout, ptr, "node_output", 0, "", ICON_NULL);
        }
 }
 
 static void node_buts_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 { 
-       uiItemR(layout, ptr, "operation", 0, "", 0);
+       uiItemR(layout, ptr, "operation", 0, "", ICON_NULL);
 }
 
 /* ****************** BUTTON CALLBACKS FOR SHADER NODES ***************** */
@@ -320,40 +320,40 @@ static void node_shader_buts_material(uiLayout *layout, bContext *C, PointerRNA
        if(!node->id) return;
        
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "use_diffuse", 0, NULL, 0);
-       uiItemR(col, ptr, "use_specular", 0, NULL, 0);
-       uiItemR(col, ptr, "invert_normal", 0, NULL, 0);
+       uiItemR(col, ptr, "use_diffuse", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "use_specular", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "invert_normal", 0, NULL, ICON_NULL);
 }
 
 static void node_shader_buts_mapping(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
        uiLayout *row;
        
-       uiItemL(layout, "Location:", 0);
+       uiItemL(layout, "Location:", ICON_NULL);
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "location", 0, "", 0);
+       uiItemR(row, ptr, "location", 0, "", ICON_NULL);
        
-       uiItemL(layout, "Rotation:", 0);
+       uiItemL(layout, "Rotation:", ICON_NULL);
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "rotation", 0, "", 0);
+       uiItemR(row, ptr, "rotation", 0, "", ICON_NULL);
        
-       uiItemL(layout, "Scale:", 0);
+       uiItemL(layout, "Scale:", ICON_NULL);
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "scale", 0, "", 0);
+       uiItemR(row, ptr, "scale", 0, "", ICON_NULL);
        
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "use_min", 0, "Min", 0);
-       uiItemR(row, ptr, "min", 0, "", 0);
+       uiItemR(row, ptr, "use_min", 0, "Min", ICON_NULL);
+       uiItemR(row, ptr, "min", 0, "", ICON_NULL);
        
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "use_max", 0, "Max", 0);
-       uiItemR(row, ptr, "max", 0, "", 0);
+       uiItemR(row, ptr, "use_max", 0, "Max", ICON_NULL);
+       uiItemR(row, ptr, "max", 0, "", ICON_NULL);
        
 }
 
 static void node_shader_buts_vect_math(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 { 
-       uiItemR(layout, ptr, "operation", 0, "", 0);
+       uiItemR(layout, ptr, "operation", 0, "", ICON_NULL);
 }
 
 static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -366,12 +366,12 @@ static void node_shader_buts_geometry(uiLayout *layout, bContext *C, PointerRNA
        if(obptr.data && RNA_enum_get(&obptr, "type") == OB_MESH) {
                PointerRNA dataptr= RNA_pointer_get(&obptr, "data");
 
-               uiItemPointerR(col, ptr, "uv_layer", &dataptr, "uv_textures", "", 0);
-               uiItemPointerR(col, ptr, "color_layer", &dataptr, "vertex_colors", "", 0);
+               uiItemPointerR(col, ptr, "uv_layer", &dataptr, "uv_textures", "", ICON_NULL);
+               uiItemPointerR(col, ptr, "color_layer", &dataptr, "vertex_colors", "", ICON_NULL);
        }
        else {
-               uiItemR(col, ptr, "uv_layer", 0, "UV", 0);
-               uiItemR(col, ptr, "color_layer", 0, "VCol", 0);
+               uiItemR(col, ptr, "uv_layer", 0, "UV", ICON_NULL);
+               uiItemR(col, ptr, "color_layer", 0, "VCol", ICON_NULL);
        }
 }
 
@@ -487,21 +487,21 @@ static void node_composit_buts_image(uiLayout *layout, bContext *C, PointerRNA *
        
        col= uiLayoutColumn(layout, 0);
        
-       uiItemR(col, &imaptr, "source", 0, NULL, 0);
+       uiItemR(col, &imaptr, "source", 0, NULL, ICON_NULL);
        
        if (ELEM(RNA_enum_get(&imaptr, "source"), IMA_SRC_SEQUENCE, IMA_SRC_MOVIE)) {
                col= uiLayoutColumn(layout, 1);
-               uiItemR(col, ptr, "frame_duration", 0, NULL, 0);
-               uiItemR(col, ptr, "frame_start", 0, NULL, 0);
-               uiItemR(col, ptr, "frame_offset", 0, NULL, 0);
-               uiItemR(col, ptr, "use_cyclic", 0, NULL, 0);
-               uiItemR(col, ptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, 0);
+               uiItemR(col, ptr, "frame_duration", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "frame_start", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "frame_offset", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "use_cyclic", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "use_auto_refresh", UI_ITEM_R_ICON_ONLY, NULL, ICON_NULL);
        }
 
        col= uiLayoutColumn(layout, 0);
        
        if (RNA_enum_get(&imaptr, "type")== IMA_TYPE_MULTILAYER)
-               uiItemR(col, ptr, "layer", 0, NULL, 0);
+               uiItemR(col, ptr, "layer", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, PointerRNA *ptr)
@@ -520,7 +520,7 @@ static void node_composit_buts_renderlayers(uiLayout *layout, bContext *C, Point
 
        col= uiLayoutColumn(layout, 0);
        row = uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "layer", 0, "", 0);
+       uiItemR(row, ptr, "layer", 0, "", ICON_NULL);
        
        prop = RNA_struct_find_property(ptr, "layer");
        if (!(RNA_property_enum_identifier(C, ptr, prop, RNA_property_enum_get(ptr, prop), &layer_name)))
@@ -543,21 +543,21 @@ static void node_composit_buts_blur(uiLayout *layout, bContext *UNUSED(C), Point
        
        col= uiLayoutColumn(layout, 0);
        
-       uiItemR(col, ptr, "filter_type", 0, "", 0);
+       uiItemR(col, ptr, "filter_type", 0, "", ICON_NULL);
        if (RNA_enum_get(ptr, "filter_type")!= R_FILTER_FAST_GAUSS) {
-               uiItemR(col, ptr, "use_bokeh", 0, NULL, 0);
-               uiItemR(col, ptr, "use_gamma_correction", 0, NULL, 0);
+               uiItemR(col, ptr, "use_bokeh", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "use_gamma_correction", 0, NULL, ICON_NULL);
        }
        
-       uiItemR(col, ptr, "use_relative", 0, NULL, 0);
+       uiItemR(col, ptr, "use_relative", 0, NULL, ICON_NULL);
        col= uiLayoutColumn(layout, 1);
        if (RNA_boolean_get(ptr, "use_relative")) {
-               uiItemR(col, ptr, "factor_x", 0, "X", 0);
-               uiItemR(col, ptr, "factor_y", 0, "Y", 0);
+               uiItemR(col, ptr, "factor_x", 0, "X", ICON_NULL);
+               uiItemR(col, ptr, "factor_y", 0, "Y", ICON_NULL);
        }
        else {
-               uiItemR(col, ptr, "size_x", 0, "X", 0);
-               uiItemR(col, ptr, "size_y", 0, "Y", 0);
+               uiItemR(col, ptr, "size_x", 0, "X", ICON_NULL);
+               uiItemR(col, ptr, "size_y", 0, "Y", ICON_NULL);
        }
 }
 
@@ -565,24 +565,24 @@ static void node_composit_buts_dblur(uiLayout *layout, bContext *UNUSED(C), Poin
 {
        uiLayout *col;
        
-       uiItemR(layout, ptr, "iterations", 0, NULL, 0);
-       uiItemR(layout, ptr, "use_wrap", 0, NULL, 0);
+       uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "use_wrap", 0, NULL, ICON_NULL);
        
        col= uiLayoutColumn(layout, 1);
-       uiItemL(col, "Center:", 0);
-       uiItemR(col, ptr, "center_x", 0, "X", 0);
-       uiItemR(col, ptr, "center_y", 0, "Y", 0);
+       uiItemL(col, "Center:", ICON_NULL);
+       uiItemR(col, ptr, "center_x", 0, "X", ICON_NULL);
+       uiItemR(col, ptr, "center_y", 0, "Y", ICON_NULL);
        
        uiItemS(layout);
        
        col= uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "distance", 0, NULL, 0);
-       uiItemR(col, ptr, "angle", 0, NULL, 0);
+       uiItemR(col, ptr, "distance", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "angle", 0, NULL, ICON_NULL);
        
        uiItemS(layout);
        
-       uiItemR(layout, ptr, "spin", 0, NULL, 0);
-       uiItemR(layout, ptr, "zoom", 0, NULL, 0);
+       uiItemR(layout, ptr, "spin", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "zoom", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -590,9 +590,9 @@ static void node_composit_buts_bilateralblur(uiLayout *layout, bContext *UNUSED(
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "iterations", 0, NULL, 0);
-       uiItemR(col, ptr, "sigma_color", 0, NULL, 0);
-       uiItemR(col, ptr, "sigma_space", 0, NULL, 0);
+       uiItemR(col, ptr, "iterations", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "sigma_color", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "sigma_space", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_defocus(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -600,60 +600,60 @@ static void node_composit_buts_defocus(uiLayout *layout, bContext *UNUSED(C), Po
        uiLayout *sub, *col;
        
        col= uiLayoutColumn(layout, 0);
-       uiItemL(col, "Bokeh Type:", 0);
-       uiItemR(col, ptr, "bokeh", 0, "", 0);
-       uiItemR(col, ptr, "angle", 0, NULL, 0);
+       uiItemL(col, "Bokeh Type:", ICON_NULL);
+       uiItemR(col, ptr, "bokeh", 0, "", ICON_NULL);
+       uiItemR(col, ptr, "angle", 0, NULL, ICON_NULL);
 
-       uiItemR(layout, ptr, "use_gamma_correction", 0, NULL, 0);
+       uiItemR(layout, ptr, "use_gamma_correction", 0, NULL, ICON_NULL);
 
        col = uiLayoutColumn(layout, 0);
        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_zbuffer")==1);
-       uiItemR(col, ptr, "f_stop", 0, NULL, 0);
+       uiItemR(col, ptr, "f_stop", 0, NULL, ICON_NULL);
 
-       uiItemR(layout, ptr, "blur_max", 0, NULL, 0);
-       uiItemR(layout, ptr, "threshold", 0, NULL, 0);
+       uiItemR(layout, ptr, "blur_max", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NULL);
 
        col = uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "use_preview", 0, NULL, 0);
+       uiItemR(col, ptr, "use_preview", 0, NULL, ICON_NULL);
        sub = uiLayoutColumn(col, 0);
        uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_preview"));
-       uiItemR(sub, ptr, "samples", 0, NULL, 0);
+       uiItemR(sub, ptr, "samples", 0, NULL, ICON_NULL);
        
        col = uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "use_zbuffer", 0, NULL, 0);
+       uiItemR(col, ptr, "use_zbuffer", 0, NULL, ICON_NULL);
        sub = uiLayoutColumn(col, 0);
        uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_zbuffer")==0);
-       uiItemR(sub, ptr, "z_scale", 0, NULL, 0);
+       uiItemR(sub, ptr, "z_scale", 0, NULL, ICON_NULL);
 }
 
 /* qdn: glare node */
 static void node_composit_buts_glare(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {      
-       uiItemR(layout, ptr, "glare_type", 0, "", 0);
-       uiItemR(layout, ptr, "quality", 0, "", 0);
+       uiItemR(layout, ptr, "glare_type", 0, "", ICON_NULL);
+       uiItemR(layout, ptr, "quality", 0, "", ICON_NULL);
 
        if (RNA_enum_get(ptr, "glare_type")!= 1) {
-               uiItemR(layout, ptr, "iterations", 0, NULL, 0);
+               uiItemR(layout, ptr, "iterations", 0, NULL, ICON_NULL);
        
                if (RNA_enum_get(ptr, "glare_type")!= 0) 
-                       uiItemR(layout, ptr, "color_modulation", UI_ITEM_R_SLIDER, NULL, 0);
+                       uiItemR(layout, ptr, "color_modulation", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
        }
        
-       uiItemR(layout, ptr, "mix", 0, NULL, 0);                
-       uiItemR(layout, ptr, "threshold", 0, NULL, 0);
+       uiItemR(layout, ptr, "mix", 0, NULL, ICON_NULL);
+       uiItemR(layout, ptr, "threshold", 0, NULL, ICON_NULL);
 
        if (RNA_enum_get(ptr, "glare_type")== 2) {
-               uiItemR(layout, ptr, "streaks", 0, NULL, 0);            
-               uiItemR(layout, ptr, "angle_offset", 0, NULL, 0);
+               uiItemR(layout, ptr, "streaks", 0, NULL, ICON_NULL);
+               uiItemR(layout, ptr, "angle_offset", 0, NULL, ICON_NULL);
        }
        if (RNA_enum_get(ptr, "glare_type")== 0 || RNA_enum_get(ptr, "glare_type")== 2) {
-               uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, 0);
+               uiItemR(layout, ptr, "fade", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
                
                if (RNA_enum_get(ptr, "glare_type")== 0) 
-                       uiItemR(layout, ptr, "use_rotate_45", 0, NULL, 0);
+                       uiItemR(layout, ptr, "use_rotate_45", 0, NULL, ICON_NULL);
        }
        if (RNA_enum_get(ptr, "glare_type")== 1) {
-               uiItemR(layout, ptr, "size", 0, NULL, 0);
+               uiItemR(layout, ptr, "size", 0, NULL, ICON_NULL);
        }
 }
 
@@ -662,17 +662,17 @@ static void node_composit_buts_tonemap(uiLayout *layout, bContext *UNUSED(C), Po
        uiLayout *col;
 
        col = uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "tonemap_type", 0, "", 0);
+       uiItemR(col, ptr, "tonemap_type", 0, "", ICON_NULL);
        if (RNA_enum_get(ptr, "tonemap_type")== 0) {
-               uiItemR(col, ptr, "key", UI_ITEM_R_SLIDER, NULL, 0);
-               uiItemR(col, ptr, "offset", 0, NULL, 0);
-               uiItemR(col, ptr, "gamma", 0, NULL, 0);
+               uiItemR(col, ptr, "key", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+               uiItemR(col, ptr, "offset", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "gamma", 0, NULL, ICON_NULL);
        }
        else {
-               uiItemR(col, ptr, "intensity", 0, NULL, 0);
-               uiItemR(col, ptr, "contrast", UI_ITEM_R_SLIDER, NULL, 0);
-               uiItemR(col, ptr, "adaptation", UI_ITEM_R_SLIDER, NULL, 0);
-               uiItemR(col, ptr, "correction", UI_ITEM_R_SLIDER, NULL, 0);
+               uiItemR(col, ptr, "intensity", 0, NULL, ICON_NULL);
+               uiItemR(col, ptr, "contrast", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+               uiItemR(col, ptr, "adaptation", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+               uiItemR(col, ptr, "correction", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
        }
 }
 
@@ -681,12 +681,12 @@ static void node_composit_buts_lensdist(uiLayout *layout, bContext *UNUSED(C), P
        uiLayout *col;
 
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "use_projector", 0, NULL, 0);
+       uiItemR(col, ptr, "use_projector", 0, NULL, ICON_NULL);
 
        col = uiLayoutColumn(col, 0);
        uiLayoutSetActive(col, RNA_boolean_get(ptr, "use_projector")==0);
-       uiItemR(col, ptr, "use_jitter", 0, NULL, 0);
-       uiItemR(col, ptr, "use_fit", 0, NULL, 0);
+       uiItemR(col, ptr, "use_jitter", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "use_fit", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_vecblur(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -694,45 +694,45 @@ static void node_composit_buts_vecblur(uiLayout *layout, bContext *UNUSED(C), Po
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "samples", 0, NULL, 0);
-       uiItemR(col, ptr, "factor", 0, "Blur", 0);
+       uiItemR(col, ptr, "samples", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "factor", 0, "Blur", ICON_NULL);
        
        col= uiLayoutColumn(layout, 1);
-       uiItemL(col, "Speed:", 0);
-       uiItemR(col, ptr, "speed_min", 0, "Min", 0);
-       uiItemR(col, ptr, "speed_max", 0, "Max", 0);
+       uiItemL(col, "Speed:", ICON_NULL);
+       uiItemR(col, ptr, "speed_min", 0, "Min", ICON_NULL);
+       uiItemR(col, ptr, "speed_max", 0, "Max", ICON_NULL);
 
-       uiItemR(layout, ptr, "use_curved", 0, NULL, 0);
+       uiItemR(layout, ptr, "use_curved", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_filter(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "filter_type", 0, "", 0);
+       uiItemR(layout, ptr, "filter_type", 0, "", ICON_NULL);
 }
 
 static void node_composit_buts_flip(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "axis", 0, "", 0);
+       uiItemR(layout, ptr, "axis", 0, "", ICON_NULL);
 }
 
 static void node_composit_buts_crop(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
        uiLayout *col;
        
-       uiItemR(layout, ptr, "use_crop_size", 0, NULL, 0);
-   uiItemR(layout, ptr, "relative", 0, NULL, 0);
+       uiItemR(layout, ptr, "use_crop_size", 0, NULL, ICON_NULL);
+   uiItemR(layout, ptr, "relative", 0, NULL, ICON_NULL);
 
        col= uiLayoutColumn(layout, 1);
    if (RNA_boolean_get(ptr, "relative")){
-      uiItemR(col, ptr, "rel_min_x", 0, "Left", 0);
-      uiItemR(col, ptr, "rel_max_x", 0, "Right", 0);
-      uiItemR(col, ptr, "rel_min_y", 0, "Up", 0);
-      uiItemR(col, ptr, "rel_max_y", 0, "Down", 0);
+      uiItemR(col, ptr, "rel_min_x", 0, "Left", ICON_NULL);
+      uiItemR(col, ptr, "rel_max_x", 0, "Right", ICON_NULL);
+      uiItemR(col, ptr, "rel_min_y", 0, "Up", ICON_NULL);
+      uiItemR(col, ptr, "rel_max_y", 0, "Down", ICON_NULL);
    } else {
-      uiItemR(col, ptr, "min_x", 0, "Left", 0);
-      uiItemR(col, ptr, "max_x", 0, "Right", 0);
-      uiItemR(col, ptr, "min_y", 0, "Up", 0);
-      uiItemR(col, ptr, "max_y", 0, "Down", 0);
+      uiItemR(col, ptr, "min_x", 0, "Left", ICON_NULL);
+      uiItemR(col, ptr, "max_x", 0, "Right", ICON_NULL);
+      uiItemR(col, ptr, "min_y", 0, "Up", ICON_NULL);
+      uiItemR(col, ptr, "max_y", 0, "Down", ICON_NULL);
    }
 }
 
@@ -742,8 +742,8 @@ static void node_composit_buts_splitviewer(uiLayout *layout, bContext *UNUSED(C)
        
        col= uiLayoutColumn(layout, 0);
        row= uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, 0);
-       uiItemR(col, ptr, "factor", 0, NULL, 0);
+       uiItemR(row, ptr, "axis", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
+       uiItemR(col, ptr, "factor", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_map_value(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -751,20 +751,20 @@ static void node_composit_buts_map_value(uiLayout *layout, bContext *UNUSED(C),
        uiLayout *sub, *col;
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "offset", 0, NULL, 0);
-       uiItemR(col, ptr, "size", 0, NULL, 0);
+       uiItemR(col, ptr, "offset", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "size", 0, NULL, ICON_NULL);
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "use_min", 0, NULL, 0);
+       uiItemR(col, ptr, "use_min", 0, NULL, ICON_NULL);
        sub =uiLayoutColumn(col, 0);
        uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_min"));
-       uiItemR(sub, ptr, "min", 0, "", 0);
+       uiItemR(sub, ptr, "min", 0, "", ICON_NULL);
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "use_max", 0, NULL, 0);
+       uiItemR(col, ptr, "use_max", 0, NULL, ICON_NULL);
        sub =uiLayoutColumn(col, 0);
        uiLayoutSetActive(sub, RNA_boolean_get(ptr, "use_max"));
-       uiItemR(sub, ptr, "max", 0, "", 0);
+       uiItemR(sub, ptr, "max", 0, "", ICON_NULL);
 }
 
 static void node_composit_buts_alphaover(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -772,8 +772,8 @@ static void node_composit_buts_alphaover(uiLayout *layout, bContext *UNUSED(C),
        uiLayout *col;
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "use_premultiply", 0, NULL, 0);
-       uiItemR(col, ptr, "premul", 0, NULL, 0);
+       uiItemR(col, ptr, "use_premultiply", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "premul", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -781,7 +781,7 @@ static void node_composit_buts_zcombine(uiLayout *layout, bContext *UNUSED(C), P
        uiLayout *col;
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "use_alpha", 0, NULL, 0);
+       uiItemR(col, ptr, "use_alpha", 0, NULL, ICON_NULL);
 }
 
 
@@ -790,14 +790,14 @@ static void node_composit_buts_hue_sat(uiLayout *layout, bContext *UNUSED(C), Po
        uiLayout *col;
        
        col =uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, 0);
+       uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_dilateerode(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "distance", 0, NULL, 0);
+       uiItemR(layout, ptr, "distance", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_diff_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -805,8 +805,8 @@ static void node_composit_buts_diff_matte(uiLayout *layout, bContext *UNUSED(C),
        uiLayout *col;
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, 0);
+       uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_distance_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -814,33 +814,33 @@ static void node_composit_buts_distance_matte(uiLayout *layout, bContext *UNUSED
        uiLayout *col;
        
        col =uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, 0);
+       uiItemR(col, ptr, "tolerance", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "falloff", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_color_spill(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
        uiLayout *row, *col;
        
-   uiItemL(layout, "Despill Channel:", 0);
+   uiItemL(layout, "Despill Channel:", ICON_NULL);
    row =uiLayoutRow(layout,0);
-       uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0);
+       uiItemR(row, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
 
    col= uiLayoutColumn(layout, 0);
-   uiItemR(col, ptr, "limit_method", 0, NULL, 0);
+   uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NULL);
 
    if(RNA_enum_get(ptr, "limit_method")==0) {
-         uiItemL(col, "Limiting Channel:", 0);
+         uiItemL(col, "Limiting Channel:", ICON_NULL);
          row=uiLayoutRow(col,0);
-         uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0);
+         uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
    }
 
-   uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, 0);
-   uiItemR(col, ptr, "use_unspill", 0, NULL, 0);   
+   uiItemR(col, ptr, "ratio", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+   uiItemR(col, ptr, "use_unspill", 0, NULL, ICON_NULL);
    if (RNA_enum_get(ptr, "use_unspill")== 1) {
-         uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, 0);
-         uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, 0);
-         uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, 0);
+         uiItemR(col, ptr, "unspill_red", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+         uiItemR(col, ptr, "unspill_green", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+         uiItemR(col, ptr, "unspill_blue", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
    }
 }
 
@@ -849,13 +849,13 @@ static void node_composit_buts_chroma_matte(uiLayout *layout, bContext *UNUSED(C
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "tolerance", 0, NULL, 0);
-       uiItemR(col, ptr, "threshold", 0, NULL, 0);
+       uiItemR(col, ptr, "tolerance", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "threshold", 0, NULL, ICON_NULL);
        
        col= uiLayoutColumn(layout, 1);
-   /*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, 0);  Removed for now */
-       uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, 0);
-   /*uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, 0);  Removed for now*/
+   /*uiItemR(col, ptr, "lift", UI_ITEM_R_SLIDER, NULL, ICON_NULL);  Removed for now */
+       uiItemR(col, ptr, "gain", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+   /*uiItemR(col, ptr, "shadow_adjust", UI_ITEM_R_SLIDER, NULL, ICON_NULL);  Removed for now*/
 }
 
 static void node_composit_buts_color_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -863,35 +863,35 @@ static void node_composit_buts_color_matte(uiLayout *layout, bContext *UNUSED(C)
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, 0);
+       uiItemR(col, ptr, "color_hue", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "color_saturation", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "color_value", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_channel_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {      
        uiLayout *col, *row;
 
-   uiItemL(layout, "Color Space:", 0);
+   uiItemL(layout, "Color Space:", ICON_NULL);
        row= uiLayoutRow(layout, 0);
-       uiItemR(row, ptr, "color_space", UI_ITEM_R_EXPAND, NULL, 0);
+       uiItemR(row, ptr, "color_space", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
 
    col=uiLayoutColumn(layout, 0);  
-   uiItemL(col, "Key Channel:", 0);
+   uiItemL(col, "Key Channel:", ICON_NULL);
        row= uiLayoutRow(col, 0);
-       uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, 0);
+       uiItemR(row, ptr, "matte_channel", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
 
        col =uiLayoutColumn(layout, 0);
 
-   uiItemR(col, ptr, "limit_method", 0, NULL, 0);
+   uiItemR(col, ptr, "limit_method", 0, NULL, ICON_NULL);
    if(RNA_enum_get(ptr, "limit_method")==0) {
-         uiItemL(col, "Limiting Channel:", 0);
+         uiItemL(col, "Limiting Channel:", ICON_NULL);
          row=uiLayoutRow(col,0);
-         uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, 0);
+         uiItemR(row, ptr, "limit_channel", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
    }
    
-       uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, 0);
+       uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_luma_matte(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -899,18 +899,18 @@ static void node_composit_buts_luma_matte(uiLayout *layout, bContext *UNUSED(C),
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, 0);
-       uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, 0);
+       uiItemR(col, ptr, "limit_max", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
+       uiItemR(col, ptr, "limit_min", UI_ITEM_R_SLIDER, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_map_uv(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "alpha", 0, NULL, 0);
+       uiItemR(layout, ptr, "alpha", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_id_mask(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "index", 0, NULL, 0);
+       uiItemR(layout, ptr, "index", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_file_output(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -918,34 +918,34 @@ static void node_composit_buts_file_output(uiLayout *layout, bContext *UNUSED(C)
        uiLayout *col, *row;
 
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "filepath", 0, "", 0);
-       uiItemR(col, ptr, "image_type", 0, "", 0);
+       uiItemR(col, ptr, "filepath", 0, "", ICON_NULL);
+       uiItemR(col, ptr, "image_type", 0, "", ICON_NULL);
        
        row= uiLayoutRow(layout, 0);
        if (RNA_enum_get(ptr, "image_type")== R_OPENEXR) {
-               uiItemR(row, ptr, "use_exr_half", 0, NULL, 0);
-               uiItemR(row, ptr, "exr_codec", 0, "", 0);
+               uiItemR(row, ptr, "use_exr_half", 0, NULL, ICON_NULL);
+               uiItemR(row, ptr, "exr_codec", 0, "", ICON_NULL);
        }
        else if (RNA_enum_get(ptr, "image_type")== R_JPEG90) {
-               uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, "Quality", 0);
+               uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, "Quality", ICON_NULL);
        }
        else if (RNA_enum_get(ptr, "image_type")== R_PNG) {
-               uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, "Compression", 0);
+               uiItemR(row, ptr, "quality", UI_ITEM_R_SLIDER, "Compression", ICON_NULL);
        }
        
        row= uiLayoutRow(layout, 1);
-       uiItemR(row, ptr, "frame_start", 0, "Start", 0);
-       uiItemR(row, ptr, "frame_end", 0, "End", 0);
+       uiItemR(row, ptr, "frame_start", 0, "Start", ICON_NULL);
+       uiItemR(row, ptr, "frame_end", 0, "End", ICON_NULL);
 }
 
 static void node_composit_buts_scale(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "space", 0, "", 0);
+       uiItemR(layout, ptr, "space", 0, "", ICON_NULL);
 }
 
 static void node_composit_buts_rotate(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-   uiItemR(layout, ptr, "filter_type", 0, "", 0);
+   uiItemR(layout, ptr, "filter_type", 0, "", ICON_NULL);
 }
 
 static void node_composit_buts_invert(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -953,25 +953,25 @@ static void node_composit_buts_invert(uiLayout *layout, bContext *UNUSED(C), Poi
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, ptr, "invert_rgb", 0, NULL, 0);
-       uiItemR(col, ptr, "invert_alpha", 0, NULL, 0);
+       uiItemR(col, ptr, "invert_rgb", 0, NULL, ICON_NULL);
+       uiItemR(col, ptr, "invert_alpha", 0, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_premulkey(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "mapping", 0, "", 0);
+       uiItemR(layout, ptr, "mapping", 0, "", ICON_NULL);
 }
 
 static void node_composit_buts_view_levels(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "channel", UI_ITEM_R_EXPAND, NULL, 0);
+       uiItemR(layout, ptr, "channel", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
 }
 
 static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
        uiLayout *split, *col, *row;
        
-       uiItemR(layout, ptr, "correction_method", 0, NULL, 0);
+       uiItemR(layout, ptr, "correction_method", 0, NULL, ICON_NULL);
        
        if (RNA_enum_get(ptr, "correction_method")== 0) {
        
@@ -979,17 +979,17 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C
                col = uiLayoutColumn(split, 0);
                uiTemplateColorWheel(col, ptr, "lift", 1, 1, 0, 1);
                row = uiLayoutRow(col, 0);
-               uiItemR(row, ptr, "lift", 0, NULL, 0);
+               uiItemR(row, ptr, "lift", 0, NULL, ICON_NULL);
                
                col = uiLayoutColumn(split, 0);
                uiTemplateColorWheel(col, ptr, "gamma", 1, 1, 1, 1);
                row = uiLayoutRow(col, 0);
-               uiItemR(row, ptr, "gamma", 0, NULL, 0);
+               uiItemR(row, ptr, "gamma", 0, NULL, ICON_NULL);
                
                col = uiLayoutColumn(split, 0);
                uiTemplateColorWheel(col, ptr, "gain", 1, 1, 1, 1);
                row = uiLayoutRow(col, 0);
-               uiItemR(row, ptr, "gain", 0, NULL, 0);
+               uiItemR(row, ptr, "gain", 0, NULL, ICON_NULL);
 
        } else {
                
@@ -997,17 +997,17 @@ static void node_composit_buts_colorbalance(uiLayout *layout, bContext *UNUSED(C
                col = uiLayoutColumn(split, 0);
                uiTemplateColorWheel(col, ptr, "offset", 1, 1, 0, 1);
                row = uiLayoutRow(col, 0);
-               uiItemR(row, ptr, "offset", 0, NULL, 0);
+               uiItemR(row, ptr, "offset", 0, NULL, ICON_NULL);
                
                col = uiLayoutColumn(split, 0);
                uiTemplateColorWheel(col, ptr, "power", 1, 1, 0, 1);
                row = uiLayoutRow(col, 0);
-               uiItemR(row, ptr, "power", 0, NULL, 0);
+               uiItemR(row, ptr, "power", 0, NULL, ICON_NULL);
                
                col = uiLayoutColumn(split, 0);
                uiTemplateColorWheel(col, ptr, "slope", 1, 1, 0, 1);
                row = uiLayoutRow(col, 0);
-               uiItemR(row, ptr, "slope", 0, NULL, 0);
+               uiItemR(row, ptr, "slope", 0, NULL, ICON_NULL);
        }
 
 }
@@ -1019,7 +1019,7 @@ static void node_composit_buts_huecorrect(uiLayout *layout, bContext *UNUSED(C),
 
 static void node_composit_buts_ycc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 { 
-       uiItemR(layout, ptr, "mode", 0, "", 0);
+       uiItemR(layout, ptr, "mode", 0, "", ICON_NULL);
 }
 
 /* only once called */
@@ -1182,12 +1182,12 @@ static void node_texture_buts_bricks(uiLayout *layout, bContext *UNUSED(C), Poin
        uiLayout *col;
        
        col= uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "offset", 0, "Offset", 0);
-       uiItemR(col, ptr, "offset_frequency", 0, "Frequency", 0);
+       uiItemR(col, ptr, "offset", 0, "Offset", ICON_NULL);
+       uiItemR(col, ptr, "offset_frequency", 0, "Frequency", ICON_NULL);
        
        col= uiLayoutColumn(layout, 1);
-       uiItemR(col, ptr, "squash", 0, "Squash", 0);
-       uiItemR(col, ptr, "squash_frequency", 0, "Frequency", 0);
+       uiItemR(col, ptr, "squash", 0, "Squash", ICON_NULL);
+       uiItemR(col, ptr, "squash_frequency", 0, "Frequency", ICON_NULL);
 }
 
 static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
@@ -1204,42 +1204,42 @@ static void node_texture_buts_proc(uiLayout *layout, bContext *UNUSED(C), Pointe
 
        switch( tex->type ) {
                case TEX_BLEND:
-                       uiItemR(col, &tex_ptr, "progression", 0, "", 0);
+                       uiItemR(col, &tex_ptr, "progression", 0, "", ICON_NULL);
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "use_flip_axis", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        break;
 
                case TEX_MARBLE:
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "marble_type", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "marble_type", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        break;
 
                case TEX_WOOD:
-                       uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0);
-                       uiItemR(col, &tex_ptr, "wood_type", 0, "", 0);
+                       uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NULL);
+                       uiItemR(col, &tex_ptr, "wood_type", 0, "", ICON_NULL);
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "noisebasis_2", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        row= uiLayoutRow(col, 0);
                        uiLayoutSetActive(row, !(RNA_enum_get(&tex_ptr, "wood_type")==TEX_BAND || RNA_enum_get(&tex_ptr, "wood_type")==TEX_RING)); 
-                       uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        break;
                        
                case TEX_CLOUDS:
-                       uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0);
+                       uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NULL);
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "cloud_type", UI_ITEM_R_EXPAND, NULL, 0);
+                       uiItemR(row, &tex_ptr, "cloud_type", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
                        row= uiLayoutRow(col, 0);
-                       uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, 0);
-                       uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, "Depth", 0);
+                       uiItemR(row, &tex_ptr, "noise_type", UI_ITEM_R_EXPAND, NULL, ICON_NULL);
+                       uiItemR(col, &tex_ptr, "noise_depth", UI_ITEM_R_EXPAND, "Depth", ICON_NULL);
                        break;
                        
                case TEX_DISTNOISE:
-                       uiItemR(col, &tex_ptr, "noise_basis", 0, "", 0);
-                       uiItemR(col, &tex_ptr, "noise_distortion", 0, "", 0);
+                       uiItemR(col, &tex_ptr, "noise_basis", 0, "", ICON_NULL);
+                       uiItemR(col, &tex_ptr, "noise_distortion", 0, "", ICON_NULL);
                        break;
        }
 }
@@ -1251,7 +1251,7 @@ static void node_texture_buts_image(uiLayout *layout, bContext *C, PointerRNA *p
 
 static void node_texture_buts_output(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr)
 {
-       uiItemR(layout, ptr, "filepath", 0, "", 0);
+       uiItemR(layout, ptr, "filepath", 0, "", ICON_NULL);
 }
 
 /* only once called */
index 4b703e6..0e7fb90 100644 (file)
@@ -570,7 +570,7 @@ static uiBlock *socket_vector_menu(bContext *C, ARegion *ar, void *socket_v)
        
        layout= uiLayoutColumn(uiBlockLayout(block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL, sock->locx, sock->locy-8, 140, 20, U.uistyles.first), 0);
        
-       uiItemR(layout, &ptr, "default_value", UI_ITEM_R_EXPAND, "", 0);
+       uiItemR(layout, &ptr, "default_value", UI_ITEM_R_EXPAND, "", ICON_NULL);
        
        return block;
 }
index 64e4bc4..1ad5954 100644 (file)
@@ -126,7 +126,7 @@ static void node_auto_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclas
 
                for(tot=0, a=0; ngroup; ngroup= ngroup->id.next, tot++) {
                        if(ngroup->type==ntree->type) {
-                               uiItemV(layout, ngroup->id.name+2, 0, NODE_GROUP_MENU+tot);
+                               uiItemV(layout, ngroup->id.name+2, ICON_NULL, NODE_GROUP_MENU+tot);
                                a++;
                        }
                }
@@ -138,11 +138,11 @@ static void node_auto_add_menu(bContext *C, uiLayout *layout, void *arg_nodeclas
                for(a=0, type= ntree->alltypes.first; type; type=type->next) {
                        if(type->nclass == nodeclass && type->name) {
                                if(type->type == NODE_DYNAMIC) {
-                                       uiItemV(layout, type->name, 0, NODE_DYNAMIC_MENU+script);
+                                       uiItemV(layout, type->name, ICON_NULL, NODE_DYNAMIC_MENU+script);
                                        script++;
                                }
                                else
-                                       uiItemV(layout, type->name, 0, type->type);
+                                       uiItemV(layout, type->name, ICON_NULL, type->type);
 
                                a++;
                        }
index 98ebeff..22304ce 100644 (file)
@@ -5323,13 +5323,13 @@ static void outliner_draw_rnabuts(uiBlock *block, Scene *scene, ARegion *ar, Spa
                                prop= te->directdata;
                                
                                if(!(RNA_property_type(prop) == PROP_POINTER && (tselem->flag & TSE_CLOSED)==0))
-                                       uiDefAutoButR(block, ptr, prop, -1, "", 0, sizex, (int)te->ys, OL_RNA_COL_SIZEX, OL_H-1);
+                                       uiDefAutoButR(block, ptr, prop, -1, "", ICON_NULL, sizex, (int)te->ys, OL_RNA_COL_SIZEX, OL_H-1);
                        }
                        else if(tselem->type == TSE_RNA_ARRAY_ELEM) {
                                ptr= &te->rnaptr;
                                prop= te->directdata;
                                
-                               uiDefAutoButR(block, ptr, prop, te->index, "", 0, sizex, (int)te->ys, OL_RNA_COL_SIZEX, OL_H-1);
+                               uiDefAutoButR(block, ptr, prop, te->index, "", ICON_NULL, sizex, (int)te->ys, OL_RNA_COL_SIZEX, OL_H-1);
                        }
                }
                
index b7bf614..8ad4d6f 100644 (file)
@@ -133,23 +133,23 @@ void TEXT_OT_properties(wmOperatorType *ot)
        uiPopupMenu *pup;
 
        if(text) {
-               pup= uiPupMenuBegin(C, "Text", 0);
+               pup= uiPupMenuBegin(C, "Text", ICON_NULL);
                if(txt_has_sel(text)) {
-                       uiItemO(layout, NULL, 0, "TEXT_OT_cut");
-                       uiItemO(layout, NULL, 0, "TEXT_OT_copy");
+                       uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_cut");
+                       uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_copy");
                }
-               uiItemO(layout, NULL, 0, "TEXT_OT_paste");
-               uiItemO(layout, NULL, 0, "TEXT_OT_new");
-               uiItemO(layout, NULL, 0, "TEXT_OT_open");
-               uiItemO(layout, NULL, 0, "TEXT_OT_save");
-               uiItemO(layout, NULL, 0, "TEXT_OT_save_as");
-               uiItemO(layout, NULL, 0, "TEXT_OT_run_script");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_paste");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save_as");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_run_script");
                uiPupMenuEnd(C, pup);
        }
        else {
-               pup= uiPupMenuBegin(C, "File", 0);
-               uiItemO(layout, NULL, 0, "TEXT_OT_new");
-               uiItemO(layout, NULL, 0, "TEXT_OT_open");
+               pup= uiPupMenuBegin(C, "File", ICON_NULL);
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open");
                uiPupMenuEnd(C, pup);
        }
 }
@@ -159,10 +159,10 @@ void TEXT_OT_properties(wmOperatorType *ot)
 
        uiPopupMenu *pup;
 
-       pup= uiPupMenuBegin(C, "Edit", 0);
-       uiItemO(layout, NULL, 0, "TEXT_OT_cut");
-       uiItemO(layout, NULL, 0, "TEXT_OT_copy");
-       uiItemO(layout, NULL, 0, "TEXT_OT_paste");
+       pup= uiPupMenuBegin(C, "Edit", ICON_NULL);
+       uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_cut");
+       uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_copy");
+       uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_paste");
        uiPupMenuEnd(C, pup);
 }
 
@@ -172,18 +172,18 @@ void TEXT_OT_properties(wmOperatorType *ot)
        uiPopupMenu *pup;
 
        if(text) {
-               pup= uiPupMenuBegin(C, "Text", 0);
-               uiItemO(layout, NULL, 0, "TEXT_OT_new");
-               uiItemO(layout, NULL, 0, "TEXT_OT_open");
-               uiItemO(layout, NULL, 0, "TEXT_OT_save");
-               uiItemO(layout, NULL, 0, "TEXT_OT_save_as");
-               uiItemO(layout, NULL, 0, "TEXT_OT_run_script");
+               pup= uiPupMenuBegin(C, "Text", ICON_NULL);
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_save_as");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_run_script");
                uiPupMenuEnd(C, pup);
        }
        else {
-               pup= uiPupMenuBegin(C, "File", 0);
-               uiItemO(layout, NULL, 0, "TEXT_OT_new");
-               uiItemO(layout, NULL, 0, "TEXT_OT_open");
+               pup= uiPupMenuBegin(C, "File", ICON_NULL);
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_new");
+               uiItemO(layout, NULL, ICON_NULL, "TEXT_OT_open");
                uiPupMenuEnd(C, pup);
        }
 }
@@ -193,7 +193,7 @@ void TEXT_OT_properties(wmOperatorType *ot)
 
        uiPopupMenu *pup;
 
-       pup= uiPupMenuBegin(C, "Text", 0);
+       pup= uiPupMenuBegin(C, "Text", ICON_NULL);
        uiItemEnumO(layout, "TEXT_OT_move", "Top of File", 0, "type", FILE_TOP);
        uiItemEnumO(layout, "TEXT_OT_move", "Bottom of File", 0, "type", FILE_BOTTOM);
        uiItemEnumO(layout, "TEXT_OT_move", "Page Up", 0, "type", PREV_PAGE);
index 062cbc7..8dc67ca 100644 (file)
@@ -2939,7 +2939,7 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(
                case 1:
                        if(text->flags & TXT_ISDIRTY) {
                                /* modified locally and externally, ahhh. offer more possibilites. */
-                               pup= uiPupMenuBegin(C, "File Modified Outside and Inside Blender", 0);
+                               pup= uiPupMenuBegin(C, "File Modified Outside and Inside Blender", ICON_NULL);
                                layout= uiPupMenuLayout(pup);
                                uiItemEnumO(layout, op->type->idname, "Reload from disk (ignore local changes)", 0, "resolution", RESOLVE_RELOAD);
                                uiItemEnumO(layout, op->type->idname, "Save to disk (ignore outside changes)", 0, "resolution", RESOLVE_SAVE);
@@ -2947,7 +2947,7 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(
                                uiPupMenuEnd(C, pup);
                        }
                        else {
-                               pup= uiPupMenuBegin(C, "File Modified Outside Blender", 0);
+                               pup= uiPupMenuBegin(C, "File Modified Outside Blender", ICON_NULL);
                                layout= uiPupMenuLayout(pup);
                                uiItemEnumO(layout, op->type->idname, "Reload from disk", 0, "resolution", RESOLVE_RELOAD);
                                uiItemEnumO(layout, op->type->idname, "Make text internal (separate copy)", 0, "resolution", RESOLVE_MAKE_INTERNAL);
@@ -2956,7 +2956,7 @@ static int resolve_conflict_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(
                        }
                        break;
                case 2:
-                       pup= uiPupMenuBegin(C, "File Deleted Outside Blender", 0);
+                       pup= uiPupMenuBegin(C, "File Deleted Outside Blender", ICON_NULL);
                        layout= uiPupMenuLayout(pup);
                        uiItemEnumO(layout, op->type->idname, "Make text internal", 0, "resolution", RESOLVE_MAKE_INTERNAL);
                        uiItemEnumO(layout, op->type->idname, "Recreate file", 0, "resolution", RESOLVE_SAVE);
index ade2403..8590043 100644 (file)
@@ -784,57 +784,57 @@ static void v3d_transform_butsR(uiLayout *layout, PointerRNA *ptr)
                uiLayoutSetActive(split, !(bone->parent && bone->flag & BONE_CONNECTED));
        }
        colsub = uiLayoutColumn(split, 1);
-       uiItemR(colsub, ptr, "location", 0, "Location", 0);
+       uiItemR(colsub, ptr, "location", 0, "Location", ICON_NULL);
        colsub = uiLayoutColumn(split, 1);
-       uiItemL(colsub, "", 0);
-       uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+       uiItemL(colsub, "", ICON_NULL);
+       uiItemR(colsub, ptr, "lock_location", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
        
        split = uiLayoutSplit(layout, 0.8, 0);
        
        switch(RNA_enum_get(ptr, "rotation_mode")) {
                case ROT_MODE_QUAT: /* quaternion */
                        colsub = uiLayoutColumn(split, 1);
-                       uiItemR(colsub, ptr, "rotation_quaternion", 0, "Rotation", 0);
+                       uiItemR(colsub, ptr, "rotation_quaternion", 0, "Rotation", ICON_NULL);
                        colsub = uiLayoutColumn(split, 1);
-                       uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", 0);
+                       uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", ICON_NULL);
                        if (RNA_boolean_get(ptr, "lock_rotations_4d"))
-                               uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+                               uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                        else
-                               uiItemL(colsub, "", 0);
-                       uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+                               uiItemL(colsub, "", ICON_NULL);
+                       uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                        break;
                case ROT_MODE_AXISANGLE: /* axis angle */
                        colsub = uiLayoutColumn(split, 1);
-                       uiItemR(colsub, ptr, "rotation_axis_angle", 0, "Rotation", 0);
+                       uiItemR(colsub, ptr, "rotation_axis_angle", 0, "Rotation", ICON_NULL);
                        colsub = uiLayoutColumn(split, 1);
-                       uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", 0);
+                       uiItemR(colsub, ptr, "lock_rotations_4d", UI_ITEM_R_TOGGLE, "4L", ICON_NULL);
                        if (RNA_boolean_get(ptr, "lock_rotations_4d"))
-                               uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+                               uiItemR(colsub, ptr, "lock_rotation_w", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                        else
-                               uiItemL(colsub, "", 0);
-                       uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+                               uiItemL(colsub, "", ICON_NULL);
+                       uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                        break;
                default: /* euler rotations */
                        colsub = uiLayoutColumn(split, 1);
-                       uiItemR(colsub, ptr, "rotation_euler", 0, "Rotation", 0);
+                       uiItemR(colsub, ptr, "rotation_euler", 0, "Rotation", ICON_NULL);
                        colsub = uiLayoutColumn(split, 1);
-                       uiItemL(colsub, "", 0);
-                       uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+                       uiItemL(colsub, "", ICON_NULL);
+                       uiItemR(colsub, ptr, "lock_rotation", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                        break;
        }
-       uiItemR(layout, ptr, "rotation_mode", 0, "", 0);
+       uiItemR(layout, ptr, "rotation_mode", 0, "", ICON_NULL);
        
        split = uiLayoutSplit(layout, 0.8, 0);
        colsub = uiLayoutColumn(split, 1);
-       uiItemR(colsub, ptr, "scale", 0, "Scale", 0);
+       uiItemR(colsub, ptr, "scale", 0, "Scale", ICON_NULL);
        colsub = uiLayoutColumn(split, 1);
-       uiItemL(colsub, "", 0);
-       uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", 0);
+       uiItemL(colsub, "", ICON_NULL);
+       uiItemR(colsub, ptr, "lock_scale", UI_ITEM_R_TOGGLE+UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
        
        if (ptr->type == &RNA_Object) {
                Object *ob = ptr->data;
                if (ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL))
-                       uiItemR(layout, ptr, "dimensions", 0, "Dimensions", 0);
+                       uiItemR(layout, ptr, "dimensions", 0, "Dimensions", ICON_NULL);
        }
 }
 
@@ -854,7 +854,7 @@ static void v3d_posearmature_buts(uiLayout *layout, Object *ob)
 //     row= uiLayoutRow(layout, 0);
        
        if (!pchan)     {
-               uiItemL(layout, "No Bone Active", 0);
+               uiItemL(layout, "No Bone Active", ICON_NULL);
                return; 
        }
 
@@ -965,18 +965,18 @@ static void v3d_editarmature_buts(uiLayout *layout, Object *ob)
 
 
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, &eboneptr, "head", 0, "Head", 0);
+       uiItemR(col, &eboneptr, "head", 0, "Head", ICON_NULL);
        if (ebone->parent && ebone->flag & BONE_CONNECTED ) {
                PointerRNA parptr = RNA_pointer_get(&eboneptr, "parent");
-               uiItemR(col, &parptr, "tail_radius", 0, "Radius (Parent)", 0);
+               uiItemR(col, &parptr, "tail_radius", 0, "Radius (Parent)", ICON_NULL);
        } else {
-               uiItemR(col, &eboneptr, "head_radius", 0, "Radius", 0);
+               uiItemR(col, &eboneptr, "head_radius", 0, "Radius", ICON_NULL);
        }
        
-       uiItemR(col, &eboneptr, "tail", 0, "Tail", 0);
-       uiItemR(col, &eboneptr, "tail_radius", 0, "Radius", 0);
+       uiItemR(col, &eboneptr, "tail", 0, "Tail", ICON_NULL);
+       uiItemR(col, &eboneptr, "tail_radius", 0, "Radius", ICON_NULL);
        
-       uiItemR(col, &eboneptr, "roll", 0, "Roll", 0);
+       uiItemR(col, &eboneptr, "roll", 0, "Roll", ICON_NULL);
 }
 
 static void v3d_editmetaball_buts(uiLayout *layout, Object *ob)
@@ -995,37 +995,37 @@ static void v3d_editmetaball_buts(uiLayout *layout, Object *ob)
        RNA_pointer_create(&mball->id, &RNA_MetaElement, mball->lastelem, &ptr);
        
        col= uiLayoutColumn(layout, 0);
-       uiItemR(col, &ptr, "co", 0, "Location", 0);
+       uiItemR(col, &ptr, "co", 0, "Location", ICON_NULL);
        
-       uiItemR(col, &ptr, "radius", 0, "Radius", 0);
-       uiItemR(col, &ptr, "stiffness", 0, "Stiffness", 0);
+       uiItemR(col, &ptr, "radius", 0, "Radius", ICON_NULL);
+       uiItemR(col, &ptr, "stiffness", 0, "Stiffness", ICON_NULL);
        
-       uiItemR(col, &ptr, "type", 0, "Type", 0);
+       uiItemR(col, &ptr, "type", 0, "Type", ICON_NULL);
        
        col= uiLayoutColumn(layout, 1);
        switch (RNA_enum_get(&ptr, "type")) {
                case MB_BALL:
                        break;
                case MB_CUBE:
-                       uiItemL(col, "Size:", 0);
-                       uiItemR(col, &ptr, "size_x", 0, "X", 0);
-                       uiItemR(col, &ptr, "size_y", 0, "Y", 0);
-                       uiItemR(col, &ptr, "size_z", 0, "Z", 0);
+                       uiItemL(col, "Size:", ICON_NULL);
+                       uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL);
+                       uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NULL);
+                       uiItemR(col, &ptr, "size_z", 0, "Z", ICON_NULL);
                        break;
                case MB_TUBE:
-                       uiItemL(col, "Size:", 0);
-                       uiItemR(col, &ptr, "size_x", 0, "X", 0);
+                       uiItemL(col, "Size:", ICON_NULL);
+                       uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL);
                        break;
                case MB_PLANE:
-                       uiItemL(col, "Size:", 0);
-                       uiItemR(col, &ptr, "size_x", 0, "X", 0);
-                       uiItemR(col, &ptr, "size_y", 0, "Y", 0);
+                       uiItemL(col, "Size:", ICON_NULL);
+                       uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL);
+                       uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NULL);
                        break;
                case MB_ELIPSOID:
-                       uiItemL(col, "Size:", 0);
-                       uiItemR(col, &ptr, "size_x", 0, "X", 0);
-                       uiItemR(col, &ptr, "size_y", 0, "Y", 0);
-                       uiItemR(col, &ptr, "size_z", 0, "Z", 0);
+                       uiItemL(col, "Size:", ICON_NULL);
+                       uiItemR(col, &ptr, "size_x", 0, "X", ICON_NULL);
+                       uiItemR(col, &ptr, "size_y", 0, "Y", ICON_NULL);
+                       uiItemR(col, &ptr, "size_z", 0, "Z", ICON_NULL);
                        break;             
        }       
 }
index 213b489..0f2f182 100644 (file)
@@ -450,7 +450,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
        uiBlockEndAlign(block);
        
        /* Draw type */
-       uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", 0);
+       uiItemR(layout, &v3dptr, "viewport_shade", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
 
        if (obedit==NULL && ((ob && ob->mode & (OB_MODE_VERTEX_PAINT|OB_MODE_WEIGHT_PAINT|OB_MODE_TEXTURE_PAINT)))) {
                /* Manipulators aren't used in weight paint mode */
@@ -458,13 +458,13 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
                PointerRNA meshptr;
 
                RNA_pointer_create(&ob->id, &RNA_Mesh, ob->data, &meshptr);
-               uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(layout, &meshptr, "use_paint_mask", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
        } else {
                const char *str_menu;
 
                row= uiLayoutRow(layout, 1);
-               uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", 0);
-               uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(row, &v3dptr, "pivot_point", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
+               uiItemR(row, &v3dptr, "use_pivot_point_align", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
 
                /* NDOF */
                /* Not implemented yet
@@ -479,7 +479,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
 
                /* Transform widget / manipulators */
                row= uiLayoutRow(layout, 1);
-               uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(row, &v3dptr, "show_manipulator", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
                block= uiLayoutGetBlock(row);
                
                if(v3d->twflag & V3D_USE_MANIPULATOR) {
@@ -507,7 +507,7 @@ void uiTemplateHeader3D(uiLayout *layout, struct bContext *C)
                        uiTemplateLayers(layout, &v3dptr, "layers", &v3dptr, "layers_used", ob_lay);
 
                /* Scene lock */
-               uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", 0);
+               uiItemR(layout, &v3dptr, "lock_camera_and_layers", UI_ITEM_R_ICON_ONLY, "", ICON_NULL);
        }
        
        /* selection modus, dont use python for this since it cant do the toggle buttons with shift+click as well as clicking to set one. */
index d7f2f14..bbb26ad 100644 (file)
@@ -995,7 +995,7 @@ static Base *mouse_select_menu(bContext *C, ViewContext *vc, unsigned int *buffe
        }
        else {
                /* UI */
-               uiPopupMenu *pup= uiPupMenuBegin(C, "Select Object", 0);
+               uiPopupMenu *pup= uiPupMenuBegin(C, "Select Object", ICON_NULL);
                uiLayout *layout= uiPupMenuLayout(pup);
                uiLayout *split= uiLayoutSplit(layout, 0, 0);
                uiLayout *column= uiLayoutColumn(split, 0);
index 56ca1ce..c87eecb 100644 (file)
@@ -93,7 +93,7 @@ static void view3d_panel_operator_redo_operator(const bContext *C, Panel *pa, wm
 {
        if(op->type->flag & OPTYPE_MACRO) {
                for(op= op->macro.first; op; op= op->next) {
-                       uiItemL(pa->layout, op->type->name, 0);
+                       uiItemL(pa->layout, op->type->name, ICON_NULL);
                        view3d_panel_operator_redo_operator(C, pa, op);
                }
        }
@@ -210,7 +210,7 @@ static void view3d_panel_tool_shelf(const bContext *C, Panel *pa)
                for(ct= st->toolshelf.first; ct; ct= ct->next) {
                        if(0==strncmp(context, ct->context, OP_MAX_TYPENAME)) {
                                col= uiLayoutColumn(pa->layout, 1);
-                               uiItemFullO(col, ct->opname, NULL, 0, NULL, WM_OP_INVOKE_REGION_WIN, 0);
+                               uiItemFullO(col, ct->opname, NULL, ICON_NULL, NULL, WM_OP_INVOKE_REGION_WIN, 0);
                        }
                }
        }
index 5f5eb2f..322bb7c 100644 (file)
@@ -150,7 +150,7 @@ static int select_orientation_invoke(bContext *C, wmOperator *UNUSED(op), wmEven
        uiPopupMenu *pup;
        uiLayout *layout;
 
-       pup= uiPupMenuBegin(C, "Orientation", 0);
+       pup= uiPupMenuBegin(C, "Orientation", ICON_NULL);
        layout= uiPupMenuLayout(pup);
        uiItemsEnumO(layout, "TRANSFORM_OT_select_orientation", "orientation");
        uiPupMenuEnd(C, pup);
index c3e8bd2..aff58b9 100644 (file)
@@ -645,7 +645,7 @@ int WM_menu_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event))
                return op->type->exec(C, op);
        }
        else {
-               pup= uiPupMenuBegin(C, op->type->name, 0);
+               pup= uiPupMenuBegin(C, op->type->name, ICON_NULL);
                layout= uiPupMenuLayout(pup);
                uiItemsFullEnumO(layout, op->type->idname, (char*)RNA_property_identifier(prop), op->ptr->data, WM_OP_EXEC_REGION_WIN, 0);
                uiPupMenuEnd(C, pup);
@@ -754,7 +754,7 @@ int WM_operator_confirm_message(bContext *C, wmOperator *op, const char *message
 
        pup= uiPupMenuBegin(C, "OK?", ICON_QUESTION);
        layout= uiPupMenuLayout(pup);
-       uiItemFullO(layout, op->type->idname, message, 0, properties, WM_OP_EXEC_REGION_WIN, 0);
+       uiItemFullO(layout, op->type->idname, message, ICON_NULL, properties, WM_OP_EXEC_REGION_WIN, 0);
        uiPupMenuEnd(C, pup);
        
        return OPERATOR_CANCELLED;
@@ -1138,7 +1138,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
                mt->draw(C, &menu);
 
 //             wmWindowManager *wm= CTX_wm_manager(C);
-//             uiItemM(layout, C, "USERPREF_MT_keyconfigs", U.keyconfigstr, 0);
+//             uiItemM(layout, C, "USERPREF_MT_keyconfigs", U.keyconfigstr, ICON_NULL);
        }
        
        uiBlockSetEmboss(block, UI_EMBOSSP);
@@ -1146,7 +1146,7 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
        
        split = uiLayoutSplit(layout, 0, 0);
        col = uiLayoutColumn(split, 0);
-       uiItemL(col, "Links", 0);
+       uiItemL(col, "Links", ICON_NULL);
        uiItemStringO(col, "Donations", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/blenderorg/blender-foundation/donation-payment/");
        uiItemStringO(col, "Release Log", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/development/release-logs/blender-254-beta/");
        uiItemStringO(col, "Manual", ICON_URL, "WM_OT_url_open", "url", "http://wiki.blender.org/index.php/Doc:Manual");
@@ -1154,16 +1154,16 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar
        uiItemStringO(col, "User Community", ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org/community/user-community/"); // 
        BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d_%d", BLENDER_VERSION/100, BLENDER_VERSION%100, BLENDER_SUBVERSION);
        uiItemStringO(col, "Python API Reference", ICON_URL, "WM_OT_url_open", "url", url);
-       uiItemL(col, "", 0);
+       uiItemL(col, "", ICON_NULL);
 
        col = uiLayoutColumn(split, 0);
-       uiItemL(col, "Recent", 0);
+       uiItemL(col, "Recent", ICON_NULL);
        for(recent = G.recent_files.first, i=0; (i<5) && (recent); recent = recent->next, i++) {
                uiItemStringO(col, BLI_path_basename(recent->filepath), ICON_FILE_BLEND, "WM_OT_open_mainfile", "filepath", recent->filepath);
        }
        uiItemS(col);
        uiItemO(col, NULL, ICON_RECOVER_LAST, "WM_OT_recover_last_session");
-       uiItemL(col, "", 0);
+       uiItemL(col, "", ICON_NULL);
        
        uiCenteredBoundsBlock(block, 0.0f);
        uiEndBlock(C, block);