diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:21:12 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-31 17:27:03 +0300 |
| commit | 941484ff81744ad2dca1741f3e9c4b4c18664a82 (patch) | |
| tree | 3d80e516e39a7d55be8439c2ce3e06943de0a3f6 /source/blender/windowmanager | |
| parent | 0dd98af2559b89149f2b6ae586969c0544c26369 (diff) | |
| parent | 7fb393f9ba3866026c8fb2c5c5ef7e0906cfe8b4 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/windowmanager')
| -rw-r--r-- | source/blender/windowmanager/intern/wm_operators.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c index 53d3cd31485..800be7a3720 100644 --- a/source/blender/windowmanager/intern/wm_operators.c +++ b/source/blender/windowmanager/intern/wm_operators.c @@ -1251,7 +1251,7 @@ int WM_operator_confirm_message_ex(bContext *C, wmOperator *op, pup = UI_popup_menu_begin(C, title, icon); layout = UI_popup_menu_layout(pup); - uiItemFullO_ptr(layout, op->type, message, ICON_NONE, properties, WM_OP_EXEC_REGION_WIN, 0); + uiItemFullO_ptr(layout, op->type, message, ICON_NONE, properties, WM_OP_EXEC_REGION_WIN, 0, NULL); UI_popup_menu_end(C, pup); return OPERATOR_INTERFACE; @@ -2019,13 +2019,11 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *UNUSED(ar "https://docs.blender.org/manual/en/dev/"); uiItemStringO(col, IFACE_("Blender Website"), ICON_URL, "WM_OT_url_open", "url", "http://www.blender.org"); if (STREQ(STRINGIFY(BLENDER_VERSION_CYCLE), "release")) { - BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d" - STRINGIFY(BLENDER_VERSION_CHAR) "_release", + BLI_snprintf(url, sizeof(url), "https://docs.blender.org/api/%d.%d"STRINGIFY(BLENDER_VERSION_CHAR), BLENDER_VERSION / 100, BLENDER_VERSION % 100); } else { - BLI_snprintf(url, sizeof(url), "http://www.blender.org/documentation/blender_python_api_%d_%d_%d", - BLENDER_VERSION / 100, BLENDER_VERSION % 100, BLENDER_SUBVERSION); + BLI_snprintf(url, sizeof(url), "https://docs.blender.org/api/master"); } uiItemStringO(col, IFACE_("Python API Reference"), ICON_URL, "WM_OT_url_open", "url", url); uiItemL(col, "", ICON_NONE); |