From 7ce069850ff729679a76dac72b5def67d870f013 Mon Sep 17 00:00:00 2001 From: Willian Padovani Germano Date: Fri, 30 Jul 2004 05:18:14 +0000 Subject: [PATCH] First of all thanks Kent Mein for committing the fix to space.c and Peter den Bak for reporting and testing it. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - making Blender not warn about 2.34 scripts, as Ton requested. Will turn this on again before release; - small fix to the new helpwebsites and helpsystem additions in BPy_menus.c, should solve problem reported by Jean-Luc Peurière about empty menus on startup; - updated version info of a few scripts to 2.34, since they use recently added bpython api functions. --- release/scripts/Apply_def.py | 2 +- release/scripts/bevel_center.py | 4 ++-- release/scripts/disp_paint.py | 4 ++-- release/scripts/rvk1_torvk2.py | 4 ++-- release/scripts/sel_same.py | 4 ++-- release/scripts/unweld044.py | 4 ++-- source/blender/python/BPY_interface.c | 4 ++-- source/blender/python/BPY_menus.c | 6 ++++-- 8 files changed, 17 insertions(+), 15 deletions(-) diff --git a/release/scripts/Apply_def.py b/release/scripts/Apply_def.py index 63838112f1f..a8f17b02c0f 100644 --- a/release/scripts/Apply_def.py +++ b/release/scripts/Apply_def.py @@ -2,7 +2,7 @@ """ Name: 'Apply Deformation' -Blender: 233 +Blender: 234 Group: 'Mesh' Tooltip: 'Create fixed copies of deformed meshes' """ diff --git a/release/scripts/bevel_center.py b/release/scripts/bevel_center.py index 37c7b64c12a..6de4a20718f 100644 --- a/release/scripts/bevel_center.py +++ b/release/scripts/bevel_center.py @@ -2,9 +2,9 @@ """ Registration info for Blender menus Name: 'Bevel Center' -Blender: 233 +Blender: 234 Group: 'Mesh' -Tip: 'Bevel selected vertices.' +Tip: 'Bevel selected vertices' """ # $Id$ diff --git a/release/scripts/disp_paint.py b/release/scripts/disp_paint.py index 8dac2a26dbf..30bcd9e88f4 100644 --- a/release/scripts/disp_paint.py +++ b/release/scripts/disp_paint.py @@ -2,9 +2,9 @@ """ Registration info for Blender menus: <- these words are ignored Name: 'Dispaint' -Blender: 233 +Blender: 234 Group: 'Mesh' -Tip: 'Use vertex paint color value to modify shape displacing vertices along normal.' +Tip: 'Use vertex paint color value to modify shape displacing vertices along normal' """ # $Id$ diff --git a/release/scripts/rvk1_torvk2.py b/release/scripts/rvk1_torvk2.py index 8350f82d84b..2987c15ca2b 100644 --- a/release/scripts/rvk1_torvk2.py +++ b/release/scripts/rvk1_torvk2.py @@ -2,9 +2,9 @@ """ Registration info for Blender menus: <- these words are ignored Name: 'Rvk1 to Rvk2' -Blender: 232 +Blender: 234 Group: 'Mesh' -Tip: 'Copy deform data (not surf. subdiv) of active obj to rvk of the 2nd selected obj.' +Tip: 'Copy deform data (not surf. subdiv) of active obj to rvk of the 2nd selected obj' """ # $Id$ diff --git a/release/scripts/sel_same.py b/release/scripts/sel_same.py index 15941272f1c..ff489c1ebae 100644 --- a/release/scripts/sel_same.py +++ b/release/scripts/sel_same.py @@ -2,9 +2,9 @@ """ Name: 'Select Same Faces' -Blender: 232 +Blender: 234 Group: 'UV' -Tooltip: 'Select faces if attributes match the active.' +Tooltip: 'Select faces if attributes match the active' """ # $Id$ diff --git a/release/scripts/unweld044.py b/release/scripts/unweld044.py index 482f24dc858..ab23cdc546d 100644 --- a/release/scripts/unweld044.py +++ b/release/scripts/unweld044.py @@ -3,7 +3,7 @@ Name: 'Unweld' Blender: 234 Group: 'Mesh' -Tip: 'Unweld all faces from a selected and common vertex. Made vertex bevelling.' +Tip: 'Unweld all faces from a selected and common vertex. Made vertex bevelling' """ # $Id$ @@ -198,7 +198,7 @@ def D(): def E(evt,val): global mouse_x,x,pl,orig,me,debut global mouse_y,y, MouseClickG,MouseClickD,MouseClickM - if (evt== QKEY or evt== ESCKEY): Exit() + if (evt== QKEY): Exit() if (evt == MOUSEX): mouse_x = val diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c index 8411ee00cb9..f3ef709e123 100644 --- a/source/blender/python/BPY_interface.c +++ b/source/blender/python/BPY_interface.c @@ -564,11 +564,11 @@ int BPY_menu_do_python(short menutype, int event) pym = BPyMenu_GetEntry(menutype, (short)event); if (!pym) return 0; - +/* uncomment before release 2.34 if (pym->version > G.version) notice ("Version mismatch: script was written for Blender %d. " "It may fail with yours: %d.", pym->version, G.version); - +*/ /* if there are submenus, let the user choose one from a pupmenu that we * create here.*/ pysm = pym->submenus; diff --git a/source/blender/python/BPY_menus.c b/source/blender/python/BPY_menus.c index de96c47fe4b..1dbbbfed9a4 100644 --- a/source/blender/python/BPY_menus.c +++ b/source/blender/python/BPY_menus.c @@ -78,8 +78,10 @@ static int bpymenu_group_atoi (char *str) if (!strcmp(str, "Import")) return PYMENU_IMPORT; else if (!strcmp(str, "Export")) return PYMENU_EXPORT; else if (!strcmp(str, "Help")) return PYMENU_HELP; - else if (!strcmp(str, "HelpWebsites")) return PYMENU_HELPWEBSITES; - else if (!strcmp(str, "HelpSystem")) return PYMENU_HELPSYSTEM; + else if (!strcmp(str, "Websites") || !strcmp(str, "HelpWebsites")) + return PYMENU_HELPWEBSITES; + else if (!strcmp(str, "System") || !strcmp(str, "HelpSystem")) + return PYMENU_HELPSYSTEM; else if (!strcmp(str, "Add")) return PYMENU_ADD; else if (!strcmp(str, "Mesh")) return PYMENU_MESH; else if (!strcmp(str, "Wizards")) return PYMENU_WIZARDS;