diff options
-rw-r--r-- | release/ui/space_info.py | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 1 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_handlers.c | 12 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_layout.c | 4 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_widgets.c | 2 | ||||
-rw-r--r-- | source/blender/editors/space_view3d/space_view3d.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_userdef.c | 2 |
8 files changed, 18 insertions, 11 deletions
diff --git a/release/ui/space_info.py b/release/ui/space_info.py index 686600ba4e7..9c08a0fe3d2 100644 --- a/release/ui/space_info.py +++ b/release/ui/space_info.py @@ -335,7 +335,7 @@ class INFO_PT_edit(bpy.types.Panel): colsplitcol.itemR(edit, "grease_pencil_manhattan_distance", text="Manhattan Distance") colsplitcol.itemR(edit, "grease_pencil_euclidean_distance", text="Euclidean Distance") colsplitcol.itemR(edit, "grease_pencil_smooth_stroke", text="Smooth Stroke") - colsplitcol.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke") + # colsplitcol.itemR(edit, "grease_pencil_simplify_stroke", text="Simplify Stroke") colsplitcol.itemR(edit, "grease_pencil_eraser_radius", text="Eraser Radius") diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index cdf4b90cee1..069129c15da 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -315,6 +315,9 @@ static void init_fastshade_shadeinput(Render *re) static Render *fastshade_get_render(Scene *scene) { + // XXX 2.5: this crashes combined with previewrender + // due to global R so disabled for now +#if 0 /* XXX ugly global still, but we can't do preview while rendering */ if(G.rendering==0) { @@ -326,6 +329,7 @@ static Render *fastshade_get_render(Scene *scene) } return re; } +#endif return NULL; } diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index f3bb975a1f7..1c58d087ec4 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -2953,7 +2953,6 @@ uiBut *uiDefIconBlockBut(uiBlock *block, uiBlockCreateFunc func, void *arg, int but->flag|= UI_HAS_ICON; but->flag|= UI_ICON_LEFT; - but->flag|= UI_ICON_SUBMENU; but->block_create_func= func; ui_check_but(but); diff --git a/source/blender/editors/interface/interface_handlers.c b/source/blender/editors/interface/interface_handlers.c index 30cfafb24f8..6f438edc966 100644 --- a/source/blender/editors/interface/interface_handlers.c +++ b/source/blender/editors/interface/interface_handlers.c @@ -315,6 +315,7 @@ static void ui_apply_autokey_undo(bContext *C, uiBut *but) static void ui_apply_but_funcs_after(bContext *C) { uiAfterFunc *afterf, after; + PointerRNA opptr; ListBase funcs; /* copy to avoid recursive calls */ @@ -328,13 +329,18 @@ static void ui_apply_but_funcs_after(bContext *C) if(after.context) CTX_store_set(C, after.context); - if(after.optype) - WM_operator_name_call(C, after.optype->idname, after.opcontext, after.opptr); if(after.opptr) { - WM_operator_properties_free(after.opptr); + /* free in advance to avoid leak on exit */ + opptr= *after.opptr, MEM_freeN(after.opptr); } + if(after.optype) + WM_operator_name_call(C, after.optype->idname, after.opcontext, (after.opptr)? &opptr: NULL); + + if(after.opptr) + WM_operator_properties_free(&opptr); + if(after.rnapoin.data) RNA_property_update(C, &after.rnapoin, after.rnaprop); diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c index 6932ad350b0..b90d930475a 100644 --- a/source/blender/editors/interface/interface_layout.c +++ b/source/blender/editors/interface/interface_layout.c @@ -222,9 +222,9 @@ static int ui_text_icon_width(uiLayout *layout, char *name, int icon) if(icon && !name[0]) return UI_UNIT_X; /* icon only */ else if(icon) - return (variable)? UI_GetStringWidth(name) + 4 + UI_UNIT_X: 10*UI_UNIT_X; /* icon + text */ + return (variable)? UI_GetStringWidth(name) + 10 + UI_UNIT_X: 10*UI_UNIT_X; /* icon + text */ else - return (variable)? UI_GetStringWidth(name) + 4 + UI_UNIT_X: 10*UI_UNIT_X; /* text only */ + return (variable)? UI_GetStringWidth(name) + 10 + UI_UNIT_X: 10*UI_UNIT_X; /* text only */ } static void ui_item_size(uiItem *item, int *r_w, int *r_h) diff --git a/source/blender/editors/interface/interface_widgets.c b/source/blender/editors/interface/interface_widgets.c index eed4425b7ad..cea3038b901 100644 --- a/source/blender/editors/interface/interface_widgets.c +++ b/source/blender/editors/interface/interface_widgets.c @@ -889,7 +889,7 @@ static void widget_draw_text_icon(uiFontStyle *fstyle, uiWidgetColors *wcol, uiB rect->xmin += UI_icon_get_width(but->icon+but->iconadd); if(but->editstr || (but->flag & UI_TEXT_LEFT)) - rect->xmin += 10; + rect->xmin += 5; } else if((but->flag & UI_TEXT_LEFT)) rect->xmin += 5; diff --git a/source/blender/editors/space_view3d/space_view3d.c b/source/blender/editors/space_view3d/space_view3d.c index e1f0b537241..48ea5cf5df2 100644 --- a/source/blender/editors/space_view3d/space_view3d.c +++ b/source/blender/editors/space_view3d/space_view3d.c @@ -889,7 +889,7 @@ void ED_spacetype_view3d(void) /* regions: tool(bar) */ art= MEM_callocN(sizeof(ARegionType), "spacetype view3d region"); art->regionid = RGN_TYPE_TOOLS; - art->minsizex= 120; // XXX + art->minsizex= 160; // XXX art->minsizey= 50; // XXX art->keymapflag= ED_KEYMAP_UI|ED_KEYMAP_FRAMES; art->listener= view3d_buttons_area_listener; diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c index 8dcca446507..42f22ba3657 100644 --- a/source/blender/makesrna/intern/rna_userdef.c +++ b/source/blender/makesrna/intern/rna_userdef.c @@ -1826,11 +1826,9 @@ static void rna_def_userdef_edit(BlenderRNA *brna) RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSMOOTH); RNA_def_property_ui_text(prop, "Grease Pencil Smooth Stroke", "Smooth the final stroke."); -#if 0 prop= RNA_def_property(srna, "grease_pencil_simplify_stroke", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "gp_settings", GP_PAINT_DOSIMPLIFY); RNA_def_property_ui_text(prop, "Grease Pencil Simplify Stroke", "Simplify the final stroke."); -#endif prop= RNA_def_property(srna, "grease_pencil_eraser_radius", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "gp_eraser"); |