diff options
74 files changed, 212 insertions, 112 deletions
diff --git a/release/scripts/DirectX8Exporter.py b/release/scripts/DirectX8Exporter.py index 3dbd8d9d539..2ec42057039 100644 --- a/release/scripts/DirectX8Exporter.py +++ b/release/scripts/DirectX8Exporter.py @@ -7,7 +7,7 @@ # Tooltip: 'Export to DirectX text file format format for XNA Animation Component Library.' """ __author__ = "minahito (original:Arben (Ben) Omari)" -__url__ = ("blender", "elysiun", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it") +__url__ = ("blender", "blenderartists.org", "Adjuster's site http://sunday-lab.blogspot.com/, Author's site http://www.omariben.too.it") __version__ = "3.0" __bpydoc__ = """\ diff --git a/release/scripts/ac3d_export.py b/release/scripts/ac3d_export.py index bccb7978f5f..57f27c7e3a2 100644 --- a/release/scripts/ac3d_export.py +++ b/release/scripts/ac3d_export.py @@ -8,7 +8,7 @@ Tip: 'Export selected meshes to AC3D (.ac) format' """ __author__ = "Willian P. Germano" -__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org", +__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org", "PLib 3d gaming lib, http://plib.sf.net") __version__ = "2.44 2007-05-05" diff --git a/release/scripts/ac3d_import.py b/release/scripts/ac3d_import.py index 9a7004e4b4d..6a2b290e010 100644 --- a/release/scripts/ac3d_import.py +++ b/release/scripts/ac3d_import.py @@ -8,7 +8,7 @@ Tip: 'Import an AC3D (.ac) file.' """ __author__ = "Willian P. Germano" -__url__ = ("blender", "elysiun", "AC3D's homepage, http://www.ac3d.org", +__url__ = ("blender", "blenderartists.org", "AC3D's homepage, http://www.ac3d.org", "PLib 3d gaming lib, http://plib.sf.net") __version__ = "2.43.1 2007-02-21" diff --git a/release/scripts/bevel_center.py b/release/scripts/bevel_center.py index 0ea305a0120..105112e6ec3 100644 --- a/release/scripts/bevel_center.py +++ b/release/scripts/bevel_center.py @@ -8,7 +8,7 @@ Tip: 'Bevel selected faces, edges, and vertices' """ __author__ = "Loic BERTHE" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "2.0" __bpydoc__ = """\ diff --git a/release/scripts/config.py b/release/scripts/config.py index 69f929dab97..4251bad8654 100644 --- a/release/scripts/config.py +++ b/release/scripts/config.py @@ -10,7 +10,7 @@ Tooltip: 'View and edit available scripts configuration data' __author__ = "Willian P. Germano" __version__ = "0.1 2005/04/14" __email__ = ('scripts', 'Author, wgermano:ig*com*br') -__url__ = ('blender', 'elysiun') +__url__ = ('blender', 'blenderartists.org') __bpydoc__ ="""\ This script can be used to view and edit configuration data stored diff --git a/release/scripts/console.py b/release/scripts/console.py index 7d9d8be5e9e..6860af4442e 100644 --- a/release/scripts/console.py +++ b/release/scripts/console.py @@ -1,14 +1,14 @@ #!BPY """ -Name: 'Interactive Console' -Blender: 237 +Name: 'Interactive Python Console' +Blender: 245 Group: 'System' Tooltip: 'Interactive Python Console' """ -__author__ = "Campbell Barton AKA Ideasman" -__url__ = ["Author's homepage, http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun", "Official Python site, http://www.python.org"] +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __bpydoc__ = """\ This is an interactive console, similar to Python's own command line interpreter. Since it is embedded in Blender, it has access to all Blender Python modules. @@ -26,8 +26,6 @@ Usage:<br> - Ctrl + Enter: auto compleate based on variable names and modules loaded -- multiple choices popup a menu;<br> - Shift + Enter: multiline functions -- delays executing code until only Enter is pressed. """ -__author__ = "Campbell Barton AKA Ideasman" -__url__ = ["http://members.iinet.net.au/~cpbarton/ideasman/", "blender", "elysiun"] # -------------------------------------------------------------------------- # ***** BEGIN GPL LICENSE BLOCK ***** diff --git a/release/scripts/envelope_symmetry.py b/release/scripts/envelope_symmetry.py index 935dae9aabe..a52e622a65b 100644 --- a/release/scripts/envelope_symmetry.py +++ b/release/scripts/envelope_symmetry.py @@ -8,7 +8,7 @@ Tooltip: 'Make envelope symetrical' """ __author__ = "Jonas Petersen" -__url__ = ("blender", "elysiun", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ") +__url__ = ("blender", "blenderartists.org", "Script's homepage, http://www.mindfloaters.de/blender/", "thread at blender.org, http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewtopic&t=4858 ") __version__ = "0.9 2004-11-10" __doc__ = """\ This script creates perfectly symmetrical envelope sets. It is part of the diff --git a/release/scripts/export_lightwave_motion.py b/release/scripts/export_lightwave_motion.py index 93a5961baef..562e44f3a2b 100644 --- a/release/scripts/export_lightwave_motion.py +++ b/release/scripts/export_lightwave_motion.py @@ -8,7 +8,7 @@ Tip: 'Export Loc Rot Size chanels to a Lightwave .mot file' """ __author__ = "Daniel Salazar (ZanQdo)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "e-mail: zanqdo@gmail.com") __version__ = "16/04/08" diff --git a/release/scripts/faceselect_same_weights.py b/release/scripts/faceselect_same_weights.py index b8d50cf09b6..967aedec363 100644 --- a/release/scripts/faceselect_same_weights.py +++ b/release/scripts/faceselect_same_weights.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Same Weights...' -Blender: 241 +Blender: 245 Group: 'FaceSelect' Tooltip: 'Select same faces with teh same weight for the active group.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = ["Campbell Barton aka ideasman42"] +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ diff --git a/release/scripts/flt_export.py b/release/scripts/flt_export.py index 80d68d10b62..35022a69bbb 100644 --- a/release/scripts/flt_export.py +++ b/release/scripts/flt_export.py @@ -8,7 +8,7 @@ Tip: 'Export to OpenFlight v16.0 (.flt)' __author__ = "Greg MacDonald, Geoffrey Bantle" __version__ = "2.0 11/21/07" -__url__ = ("blender", "elysiun", "Author's homepage, http://sourceforge.net/projects/blight/") +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://sourceforge.net/projects/blight/") __bpydoc__ = """\ This script exports v16.0 OpenFlight files. OpenFlight is a registered trademark of MultiGen-Paradigm, Inc. diff --git a/release/scripts/flt_import.py b/release/scripts/flt_import.py index d31376995d4..c924194f44b 100644 --- a/release/scripts/flt_import.py +++ b/release/scripts/flt_import.py @@ -10,7 +10,7 @@ Tip: 'Import OpenFlight (.flt)' __author__ = "Greg MacDonald, Campbell Barton, Geoffrey Bantle" __version__ = "2.0 11/21/07" -__url__ = ("blender", "elysiun", "Author's homepage, http://sourceforge.net/projects/blight/") +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://sourceforge.net/projects/blight/") __bpydoc__ = """\ This script imports OpenFlight files into Blender. OpenFlight is a registered trademark of MultiGen-Paradigm, Inc. diff --git a/release/scripts/flt_palettemanager.py b/release/scripts/flt_palettemanager.py index c641a0a4f08..6edaf2974ab 100644 --- a/release/scripts/flt_palettemanager.py +++ b/release/scripts/flt_palettemanager.py @@ -10,7 +10,7 @@ Tooltip: 'Manage FLT colors' __author__ = "Geoffrey Bantle" __version__ = "1.0 11/21/2007" __email__ = ('scripts', 'Author, ') -__url__ = ('blender', 'elysiun') +__url__ = ('blender', 'blenderartists.org') __bpydoc__ ="""\ diff --git a/release/scripts/flt_toolbar.py b/release/scripts/flt_toolbar.py index 565849859c1..a707b87f846 100644 --- a/release/scripts/flt_toolbar.py +++ b/release/scripts/flt_toolbar.py @@ -10,7 +10,7 @@ Tooltip: 'Tools for working with FLT databases' __author__ = "Geoffrey Bantle" __version__ = "1.0 11/21/07" __email__ = ('scripts', 'Author, ') -__url__ = ('blender', 'elysiun') +__url__ = ('blender', 'blenderartists.org') __bpydoc__ ="""\ This script provides tools for working with OpenFlight databases in Blender. OpenFlight is a diff --git a/release/scripts/help_browser.py b/release/scripts/help_browser.py index d321ffa6256..696dfd3ca2b 100644 --- a/release/scripts/help_browser.py +++ b/release/scripts/help_browser.py @@ -10,7 +10,7 @@ Tooltip: 'Show help information about a chosen installed script.' __author__ = "Willian P. Germano" __version__ = "0.1 11/02/04" __email__ = ('scripts', 'Author, wgermano:ig*com*br') -__url__ = ('blender', 'elysiun') +__url__ = ('blender', 'blenderartists.org') __bpydoc__ ="""\ This script shows help information for scripts registered in the menus. @@ -84,8 +84,7 @@ DEFAULT_EMAILS = { } DEFAULT_LINKS = { - 'blender': ["blender.org\'s Python forum", "http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewforum&f=9"], - 'elysiun': ["elYsiun\'s Python and Plugins forum", "http://www.elysiun.com/forum/viewforum.php?f=5"] + 'blender': ["blender.org\'s Python forum", "http://www.blender.org/modules.php?op=modload&name=phpBB2&file=viewforum&f=9"] } PADDING = 15 diff --git a/release/scripts/help_getting_started.py b/release/scripts/help_getting_started.py index 19eac9e2e20..81b002da4e4 100644 --- a/release/scripts/help_getting_started.py +++ b/release/scripts/help_getting_started.py @@ -7,7 +7,7 @@ Tooltip: 'Help for new users' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender3d.org's diff --git a/release/scripts/help_manual.py b/release/scripts/help_manual.py index 75d93522c31..cf293bf7c2c 100644 --- a/release/scripts/help_manual.py +++ b/release/scripts/help_manual.py @@ -7,7 +7,7 @@ Tooltip: 'The Blender reference manual' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender3d.org's diff --git a/release/scripts/help_release_notes.py b/release/scripts/help_release_notes.py index 49382755163..af7a7042489 100644 --- a/release/scripts/help_release_notes.py +++ b/release/scripts/help_release_notes.py @@ -7,7 +7,7 @@ Tooltip: 'Information about the changes in this version of Blender' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender3d.org's diff --git a/release/scripts/help_tutorials.py b/release/scripts/help_tutorials.py index 1fbabc43eb6..04d6c799455 100644 --- a/release/scripts/help_tutorials.py +++ b/release/scripts/help_tutorials.py @@ -8,7 +8,7 @@ Tooltip: 'Tutorials for learning to use Blender' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender3d.org's diff --git a/release/scripts/help_web_blender.py b/release/scripts/help_web_blender.py index 999746c1f9c..0f9e32dea0e 100644 --- a/release/scripts/help_web_blender.py +++ b/release/scripts/help_web_blender.py @@ -8,7 +8,7 @@ Tooltip: 'The official Blender website' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at Blender's main site, diff --git a/release/scripts/help_web_devcomm.py b/release/scripts/help_web_devcomm.py index afe9ef064d9..344622cc113 100644 --- a/release/scripts/help_web_devcomm.py +++ b/release/scripts/help_web_devcomm.py @@ -8,7 +8,7 @@ Tooltip: 'Get involved with Blender development' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender.org, the diff --git a/release/scripts/help_web_eshop.py b/release/scripts/help_web_eshop.py index 997d07ca255..451fd735150 100644 --- a/release/scripts/help_web_eshop.py +++ b/release/scripts/help_web_eshop.py @@ -8,7 +8,7 @@ Tooltip: 'Buy official Blender resources and merchandise online' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender3d.org's diff --git a/release/scripts/help_web_usercomm.py b/release/scripts/help_web_usercomm.py index 56f64764ac7..fbe19956eb7 100644 --- a/release/scripts/help_web_usercomm.py +++ b/release/scripts/help_web_usercomm.py @@ -8,7 +8,7 @@ Tooltip: 'Get involved with other Blender users' """ __author__ = "Matt Ebb" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ This script opens the user's default web browser at www.blender3d.org's diff --git a/release/scripts/image_edit.py b/release/scripts/image_edit.py index 14ab57515ba..a7132a4f986 100644 --- a/release/scripts/image_edit.py +++ b/release/scripts/image_edit.py @@ -7,7 +7,7 @@ Tooltip: 'Open in an application for editing. (hold Shift to configure)' """ __author__ = "Campbell Barton" -__url__ = ["blender", "elysiun"] +__url__ = ["blender", "blenderartists.org"] __version__ = "1.0" __bpydoc__ = """\ diff --git a/release/scripts/import_lightwave_motion.py b/release/scripts/import_lightwave_motion.py index bec988c8da5..c242a9f6bd3 100644 --- a/release/scripts/import_lightwave_motion.py +++ b/release/scripts/import_lightwave_motion.py @@ -8,7 +8,7 @@ Tip: 'Import Loc Rot Size chanels from a Lightwave .mot file' """ __author__ = "Daniel Salazar (ZanQdo)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "e-mail: zanqdo@gmail.com") __version__ = "16/04/08" diff --git a/release/scripts/lightwave_export.py b/release/scripts/lightwave_export.py index b0fc1cc7faf..458e61f3a28 100644 --- a/release/scripts/lightwave_export.py +++ b/release/scripts/lightwave_export.py @@ -8,7 +8,7 @@ Tooltip: 'Export selected meshes to LightWave File Format (.lwo)' """ __author__ = "Anthony D'Agostino (Scorpius)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://www.redrival.com/scorpius") __version__ = "Part of IOSuite 0.5" diff --git a/release/scripts/md2_export.py b/release/scripts/md2_export.py index 6fc7c1adfa2..588336ed447 100644 --- a/release/scripts/md2_export.py +++ b/release/scripts/md2_export.py @@ -10,7 +10,7 @@ Tooltip: 'Export to Quake file format (.md2).' __author__ = 'Bob Holcomb' __version__ = '0.18.1 patch 1' __url__ = ["Bob's site, http://bane.servebeer.com", - "Support forum, http://bane.servebeer.com", "blender", "elysiun"] + "Support forum, http://bane.servebeer.com", "blender", "blenderartists.org"] __email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"] __bpydoc__ = """\ This script Exports a Quake 2 file (MD2). diff --git a/release/scripts/md2_import.py b/release/scripts/md2_import.py index ec778c1e1b8..f52746259a6 100644 --- a/release/scripts/md2_import.py +++ b/release/scripts/md2_import.py @@ -10,7 +10,7 @@ Tooltip: 'Import from Quake file format (.md2).' __author__ = 'Bob Holcomb' __version__ = '0.16' __url__ = ["Bob's site, http://bane.servebeer.com", - "Support forum, http://scourage.servebeer.com/phpbb/", "blender", "elysiun"] + "Support forum, http://scourage.servebeer.com/phpbb/", "blender", "blenderartists.org"] __email__ = ["Bob Holcomb, bob_holcomb:hotmail*com", "scripts"] __bpydoc__ = """\ This script imports a Quake 2 file (MD2), textures, diff --git a/release/scripts/mesh_boneweight_copy.py b/release/scripts/mesh_boneweight_copy.py index 8aa9a1e3213..d2a477fbc0b 100644 --- a/release/scripts/mesh_boneweight_copy.py +++ b/release/scripts/mesh_boneweight_copy.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Bone Weight Copy' -Blender: 243 +Blender: 245 Group: 'Object' Tooltip: 'Copy Bone Weights from 1 mesh, to all other selected meshes.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ diff --git a/release/scripts/mesh_cleanup.py b/release/scripts/mesh_cleanup.py index 1eb3e3968b2..608201acb98 100644 --- a/release/scripts/mesh_cleanup.py +++ b/release/scripts/mesh_cleanup.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Clean Meshes' -Blender: 242 +Blender: 245 Group: 'Mesh' Tooltip: 'Clean unused data from all selected mesh objects.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ Clean Meshes diff --git a/release/scripts/mesh_edges2curves.py b/release/scripts/mesh_edges2curves.py index f65eccae9a4..006bdf10b49 100644 --- a/release/scripts/mesh_edges2curves.py +++ b/release/scripts/mesh_edges2curves.py @@ -6,7 +6,7 @@ Group: 'Mesh' Tip: 'Edges not used by a face are converted into polyline(s)' """ __author__ = ("Campbell Barton") -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0 2006/02/08" __bpydoc__ = """\ diff --git a/release/scripts/mesh_mirror_tool.py b/release/scripts/mesh_mirror_tool.py index 045f37b8333..33ce6936c7f 100644 --- a/release/scripts/mesh_mirror_tool.py +++ b/release/scripts/mesh_mirror_tool.py @@ -6,8 +6,8 @@ Group: 'Mesh' Tooltip: 'Snap Verticies to X mirrord locations and weights.' """ -__author__= ['Campbell Barton'] -__url__= ["blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/"] +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__= '1.0' __bpydoc__= '''\ This script is used to mirror vertex locations and weights diff --git a/release/scripts/mesh_poly_reduce.py b/release/scripts/mesh_poly_reduce.py index 9d8bb61f652..6dfd7a90efc 100644 --- a/release/scripts/mesh_poly_reduce.py +++ b/release/scripts/mesh_poly_reduce.py @@ -7,7 +7,7 @@ Tooltip: 'Removed polygons from a mesh while maintaining the shape, textures and """ __author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0 2006/02/07" __bpydoc__ = """\ diff --git a/release/scripts/obdatacopier.py b/release/scripts/obdatacopier.py index 561e40e15da..2f5617951de 100644 --- a/release/scripts/obdatacopier.py +++ b/release/scripts/obdatacopier.py @@ -8,7 +8,7 @@ Tip: 'Copy data from active object to other selected ones.' """ __author__ = "Jean-Michel Soler (jms), Campbell Barton (Ideasman42)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_lampdatacopier.htm", "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender") __version__ = "0.1.2" diff --git a/release/scripts/object_apply_def.py b/release/scripts/object_apply_def.py index 67e4179a674..c863fdb6962 100644 --- a/release/scripts/object_apply_def.py +++ b/release/scripts/object_apply_def.py @@ -12,7 +12,7 @@ __author__ = "Martin Poirier (theeth), Jean-Michel Soler (jms), Campbell Barton # Martin Poirier's Apply_Def.py and # Jean-Michel Soler's Fix From Everything -__url__ = ("http://www.blender.org", "http://blenderartists.org", "http://members.iinet.net.au/~cpbarton/ideasman/", "http://jmsoler.free.fr") +__url__ = ("http://www.blender.org", "http://blenderartists.org", "http://jmsoler.free.fr") __version__ = "1.6 07/07/2006" __bpydoc__ = """\ diff --git a/release/scripts/object_batch_name_edit.py b/release/scripts/object_batch_name_edit.py index 05ca5868d19..4db3a6210db 100644 --- a/release/scripts/object_batch_name_edit.py +++ b/release/scripts/object_batch_name_edit.py @@ -6,7 +6,7 @@ Group: 'Object' Tooltip: 'Apply the chosen rule to rename all selected objects at once.' """ __author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ diff --git a/release/scripts/off_export.py b/release/scripts/off_export.py index 236e6195690..6aac3ff885b 100644 --- a/release/scripts/off_export.py +++ b/release/scripts/off_export.py @@ -8,7 +8,7 @@ Tooltip: 'Export selected mesh to DEC Object File Format (*.off)' """ __author__ = "Anthony D'Agostino (Scorpius)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://www.redrival.com/scorpius") __version__ = "Part of IOSuite 0.5" diff --git a/release/scripts/off_import.py b/release/scripts/off_import.py index 50c0d3d6f7e..e8ab96c51c5 100644 --- a/release/scripts/off_import.py +++ b/release/scripts/off_import.py @@ -8,7 +8,7 @@ Tooltip: 'Import DEC Object File Format (*.off)' """ __author__ = "Anthony D'Agostino (Scorpius), Campbell Barton (Ideasman)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://www.redrival.com/scorpius") __version__ = "Part of IOSuite 0.5" diff --git a/release/scripts/paths_import.py b/release/scripts/paths_import.py index f36454978ba..6afb5c8ebba 100644 --- a/release/scripts/paths_import.py +++ b/release/scripts/paths_import.py @@ -13,7 +13,7 @@ Tip: 'Import a path from any of a set of formats (still experimental)' """ __author__ = "Jean-Michel Soler (jms)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "AI importer's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_import_ai.htm", "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender") __version__ = "0.1.1" diff --git a/release/scripts/raw_export.py b/release/scripts/raw_export.py index 02eb5ad3f36..b559f2fb7c3 100644 --- a/release/scripts/raw_export.py +++ b/release/scripts/raw_export.py @@ -8,7 +8,7 @@ Tooltip: 'Export selected mesh to Raw Triangle Format (.raw)' """ __author__ = "Anthony D'Agostino (Scorpius)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://www.redrival.com/scorpius") __version__ = "Part of IOSuite 0.5" diff --git a/release/scripts/raw_import.py b/release/scripts/raw_import.py index a77ed9cc03a..76c03c77337 100644 --- a/release/scripts/raw_import.py +++ b/release/scripts/raw_import.py @@ -8,7 +8,7 @@ Tooltip: 'Import Raw Triangle File Format (.raw)' """ __author__ = "Anthony D'Agostino (Scorpius)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://www.redrival.com/scorpius") __version__ = "Part of IOSuite 0.5" diff --git a/release/scripts/renameobjectbyblock.py b/release/scripts/renameobjectbyblock.py index 403aa32717e..eeea815c650 100644 --- a/release/scripts/renameobjectbyblock.py +++ b/release/scripts/renameobjectbyblock.py @@ -8,7 +8,7 @@ Tip: 'GUI to select and rename objects.' """ __author__ = "Jean-Michel Soler (jms)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_renameobjectgui.htm", "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender") __version__ = "233" diff --git a/release/scripts/render_save_layers.py b/release/scripts/render_save_layers.py index 04bedde6e8d..06f410b9783 100644 --- a/release/scripts/render_save_layers.py +++ b/release/scripts/render_save_layers.py @@ -8,7 +8,7 @@ Tooltip: 'Save current renderlayers as a BPython script' """ __author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0" __bpydoc__ = """\ diff --git a/release/scripts/rvk1_torvk2.py b/release/scripts/rvk1_torvk2.py index 754d2d0af2d..c8d6fe0e741 100644 --- a/release/scripts/rvk1_torvk2.py +++ b/release/scripts/rvk1_torvk2.py @@ -8,7 +8,7 @@ Tip: 'Copy deform data (not surf. subdiv) of active obj to rvk of the 2nd select """ __author__ = "Jean-Michel Soler (jms)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_rvk1versrvk2.htm", "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender") __version__ = "2007/04/27" diff --git a/release/scripts/save_theme.py b/release/scripts/save_theme.py index a99050b404d..1d23b12403a 100644 --- a/release/scripts/save_theme.py +++ b/release/scripts/save_theme.py @@ -8,7 +8,7 @@ Tooltip: 'Save current theme as a BPython script' """ __author__ = "Willian P. Germano" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "2.43 2006/12/30" __bpydoc__ = """\ diff --git a/release/scripts/scripttemplate_camer_object.py b/release/scripts/scripttemplate_camer_object.py index b4df64d9108..cacc35ed1a5 100644 --- a/release/scripts/scripttemplate_camer_object.py +++ b/release/scripts/scripttemplate_camer_object.py @@ -98,7 +98,7 @@ SceneCheck() ''' -new_text = bpy.data.texts.new('pyconstraint_template.py') +new_text = bpy.data.texts.new('camobject_template.py') new_text.write(script_data) bpy.data.texts.active = new_text Window.RedrawAll() diff --git a/release/scripts/scripttemplate_ipo_gen.py b/release/scripts/scripttemplate_ipo_gen.py new file mode 100644 index 00000000000..791eaed2c6b --- /dev/null +++ b/release/scripts/scripttemplate_ipo_gen.py @@ -0,0 +1,92 @@ +#!BPY +""" +Name: 'Camera/Object Example' +Blender: 245 +Group: 'ScriptTemplate' +Tooltip: 'Script template for setting the camera direction' +""" + +from Blender import Window +import bpy + +script_data = \ +'''#!BPY +""" +Name: 'My Ipo Script' +Blender: 245 +Group: 'Animation' +Tooltip: 'Put some useful info here' +""" + +# Add a licence here if you wish to re-distribute, we recommend the GPL + +from Blender import Ipo, Mathutils, Window +import bpy, BPyMessages + +def makeRandomIpo(object, firstFrame, numberOfFrames, frameStep): + # Create an new Ipo Curve of name myIpo and type Object + myIpo = bpy.data.ipos.new('myIpo', 'Object') + + # Create LocX, LocY, and LocZ Ipo curves in our new Curve Object + # and store them so we can access them later + myIpo_x = myIpo.addCurve('LocX') + myIpo_y = myIpo.addCurve('LocY') + myIpo_z = myIpo.addCurve('LocZ') + + # What value we want to scale our random value by + ipoScale = 4 + + # This Calculates the End Frame for use in an xrange() expression + endFrame = firstFrame + (numberOfFrames * frameStep) + frameStep + + for frame in xrange(firstFrame, endFrame, frameStep): + + # Use the Mathutils Rand() function to get random numbers + ipoValue_x = Mathutils.Rand(-1, 1) * ipoScale + ipoValue_y = Mathutils.Rand(-1, 1) * ipoScale + ipoValue_z = Mathutils.Rand(-1, 1) * ipoScale + + # Append to the Ipo curve at location frame, with the value ipoValue_x + # Note that we should pass the append function a tuple or a BezTriple + myIpo_x.append((frame, ipoValue_x)) + + # Similar to above + myIpo_y.append((frame, ipoValue_y)) + myIpo_z.append((frame, ipoValue_z)) + + # Link our new Ipo Curve to the passed object + object.setIpo(myIpo) + print object + + +def main(): + + # Get the active scene, since there can be multiple ones + sce = bpy.data.scenes.active + + # Get the active object + object = sce.objects.active + + # If there is no active object, pop up an error message + if not object: + BPyMessages.Error_NoActive() + + Window.WaitCursor(1) + + # Call our makeRandomIpo function + # Pass it our object, Tell it to keys from the start frame until the end frame, at a step of 10 frames + # between them + + makeRandomIpo(object, sce.render.sFrame, sce.render.eFrame, 10) + + Window.WaitCursor(0) + +if __name__ == '__main__': + main() + +''' + +new_text = bpy.data.texts.new('ipo_template.py') +new_text.write(script_data) +bpy.data.texts.active = new_text +Window.RedrawAll() diff --git a/release/scripts/scripttemplate_metaball_create.py b/release/scripts/scripttemplate_metaball_create.py index 881f9c4fc4b..28db9de3af6 100644 --- a/release/scripts/scripttemplate_metaball_create.py +++ b/release/scripts/scripttemplate_metaball_create.py @@ -70,7 +70,7 @@ if __name__ == '__main__': main() ''' -new_text = bpy.data.texts.new('pyconstraint_template.py') +new_text = bpy.data.texts.new('metaball_template.py') new_text.write(script_data) bpy.data.texts.active = new_text Window.RedrawAll() diff --git a/release/scripts/scripttemplate_object_edit.py b/release/scripts/scripttemplate_object_edit.py index 4f8e0bccfa2..3ba20f20dd1 100644 --- a/release/scripts/scripttemplate_object_edit.py +++ b/release/scripts/scripttemplate_object_edit.py @@ -13,7 +13,7 @@ script_data = \ '''#!BPY """ Name: 'My Object Script' -Blender: 244 +Blender: 245 Group: 'Object' Tooltip: 'Put some useful info here' """ @@ -78,4 +78,4 @@ if __name__ == '__main__': new_text = bpy.data.texts.new('object_template.py') new_text.write(script_data) bpy.data.texts.active = new_text -Window.RedrawAll()
\ No newline at end of file +Window.RedrawAll() diff --git a/release/scripts/slp_import.py b/release/scripts/slp_import.py index 95f6900cf10..30387ad7440 100644 --- a/release/scripts/slp_import.py +++ b/release/scripts/slp_import.py @@ -8,7 +8,7 @@ Tooltip: 'Import Pro Engineer (.slp) File Format' """ __author__ = "Anthony D'Agostino (Scorpius)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Author's homepage, http://www.redrival.com/scorpius") __version__ = "Part of IOSuite 0.5" diff --git a/release/scripts/sysinfo.py b/release/scripts/sysinfo.py index 01cff8ae57f..9f24885829c 100644 --- a/release/scripts/sysinfo.py +++ b/release/scripts/sysinfo.py @@ -8,7 +8,7 @@ Tooltip: 'Information about your Blender environment, useful to diagnose problem """ __author__ = "Willian P. Germano" -__url__ = ("blender", "elysiun") +__url__ = ("blenderartists.org", "blenderartists.org") __version__ = "1.1" __bpydoc__ = """\ This script creates a text in Blender's Text Editor with information diff --git a/release/scripts/unweld.py b/release/scripts/unweld.py index 34877837bb7..3385e66e2d8 100644 --- a/release/scripts/unweld.py +++ b/release/scripts/unweld.py @@ -7,7 +7,7 @@ Tip: 'Unweld all faces from a (or several) selected and common vertex. Made vert """ __author__ = "Jean-Michel Soler (jms)" -__url__ = ("blender", "elysiun", +__url__ = ("blender", "blenderartists.org", "Script's homepage, http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_faces2vertex.htm#exemple", "Communicate problems and errors, http://www.zoo-logique.org/3D.Blender/newsportal/thread.php?group=3D.Blender") __version__ = "0.4.6 " diff --git a/release/scripts/uv_from_adjacent.py b/release/scripts/uv_from_adjacent.py index dfdad3118d9..285cca97d8b 100644 --- a/release/scripts/uv_from_adjacent.py +++ b/release/scripts/uv_from_adjacent.py @@ -6,7 +6,7 @@ Group: 'UVCalculation' Tooltip: 'Assign UVs to selected faces from surrounding unselected faces.' """ __author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0 2006/02/07" __bpydoc__ = """\ diff --git a/release/scripts/uvcalc_follow_active_coords.py b/release/scripts/uvcalc_follow_active_coords.py index 2a79d0d05df..79a445329cc 100644 --- a/release/scripts/uvcalc_follow_active_coords.py +++ b/release/scripts/uvcalc_follow_active_coords.py @@ -6,7 +6,7 @@ Group: 'UVCalculation' Tooltip: 'Follow from active quads.' """ __author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.0 2006/02/07" __bpydoc__ = """\ diff --git a/release/scripts/uvcalc_lightmap.py b/release/scripts/uvcalc_lightmap.py index af9acb09e17..3b7c3ac7cf9 100644 --- a/release/scripts/uvcalc_lightmap.py +++ b/release/scripts/uvcalc_lightmap.py @@ -5,8 +5,8 @@ Blender: 242 Group: 'UVCalculation' Tooltip: 'Give each face non overlapping space on a texture.' """ -__author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ("blender", "blenderartists.org") __version__ = "1.0 2006/02/07" __bpydoc__ = """\ diff --git a/release/scripts/uvcalc_quad_clickproj.py b/release/scripts/uvcalc_quad_clickproj.py index 791fd661cc9..0bba747e010 100644 --- a/release/scripts/uvcalc_quad_clickproj.py +++ b/release/scripts/uvcalc_quad_clickproj.py @@ -2,13 +2,13 @@ """ Registration info for Blender menus: <- these words are ignored Name: 'Click project from face' -Blender: 242 +Blender: 245 Group: 'UVCalculation' Tooltip: '3 Clicks to project uvs onto selected faces.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__=\ ''' diff --git a/release/scripts/uvcalc_smart_project.py b/release/scripts/uvcalc_smart_project.py index 49d52d12d47..d622e1a2af8 100644 --- a/release/scripts/uvcalc_smart_project.py +++ b/release/scripts/uvcalc_smart_project.py @@ -9,7 +9,7 @@ Tooltip: 'UV Unwrap mesh faces for all select mesh objects' __author__ = "Campbell Barton" -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.1 12/18/05" __bpydoc__ = """\ diff --git a/release/scripts/uvcopy.py b/release/scripts/uvcopy.py index 1ac63dd52b5..73206e47109 100644 --- a/release/scripts/uvcopy.py +++ b/release/scripts/uvcopy.py @@ -7,9 +7,7 @@ Tip: 'Copy UV coords from a mesh to another that has same vertex indices' """ __author__ = "Toni Alatalo, Martin Poirier et. al." -__url__ = ("blender", "elysiun", -"Script's homepage, http://www.elysiun.com/forum/viewtopic.php?t=14897", -"Communicate problems and errors, http://www.elysiun.com/forum/viewtopic.php?t=14897") +__url__ = ("blender", "blenderartists.org") __version__ = "0.2 01/2006" __bpydoc__ = """\ diff --git a/release/scripts/vertexpaint_gradient.py b/release/scripts/vertexpaint_gradient.py index d0b7de329df..17eccb4f67f 100644 --- a/release/scripts/vertexpaint_gradient.py +++ b/release/scripts/vertexpaint_gradient.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'VCol Gradient...' -Blender: 241 +Blender: 245 Group: 'VertexPaint' Tooltip: 'Click on the start and end grad points for the mesh for selected faces.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" # ***** BEGIN GPL LICENSE BLOCK ***** diff --git a/release/scripts/vertexpaint_selfshadow_ao.py b/release/scripts/vertexpaint_selfshadow_ao.py index 7a6f4f9176d..95ba7d2fb23 100644 --- a/release/scripts/vertexpaint_selfshadow_ao.py +++ b/release/scripts/vertexpaint_selfshadow_ao.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Self Shadow VCols (AO)...' -Blender: 241 +Blender: 245 Group: 'VertexPaint' Tooltip: 'Generate Fake Ambient Occlusion with vertex colors.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ diff --git a/release/scripts/vrml97_export.py b/release/scripts/vrml97_export.py index 57ffd243bfc..eb3be80c99c 100644 --- a/release/scripts/vrml97_export.py +++ b/release/scripts/vrml97_export.py @@ -10,7 +10,7 @@ Tooltip: 'Export to VRML97 file (.wrl)' """ __author__ = ("Rick Kimball", "Ken Miller", "Steve Matthews", "Bart") -__url__ = ["blender", "elysiun", +__url__ = ["blender", "blenderartists.org", "Author's (Rick) homepage, http://kimballsoftware.com/blender", "Author's (Bart) homepage, http://www.neeneenee.de/vrml"] __email__ = ["Bart, bart:neeneenee*de"] diff --git a/release/scripts/weightpaint_clean.py b/release/scripts/weightpaint_clean.py index d6cddba5fa2..ba1896f011e 100644 --- a/release/scripts/weightpaint_clean.py +++ b/release/scripts/weightpaint_clean.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Clean Weight...' -Blender: 241 +Blender: 245 Group: 'WeightPaint' Tooltip: 'Removed verts from groups below a weight limit.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ diff --git a/release/scripts/weightpaint_gradient.py b/release/scripts/weightpaint_gradient.py index a2bff999610..eb7aff7eb89 100644 --- a/release/scripts/weightpaint_gradient.py +++ b/release/scripts/weightpaint_gradient.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Weight Gradient...' -Blender: 241 +Blender: 245 Group: 'WeightPaint' Tooltip: 'Click on the start and end grad points for the mesh for selected faces.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__=\ ''' diff --git a/release/scripts/weightpaint_grow_shrink.py b/release/scripts/weightpaint_grow_shrink.py index 5527f59e5ae..5c0f28685f9 100644 --- a/release/scripts/weightpaint_grow_shrink.py +++ b/release/scripts/weightpaint_grow_shrink.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Grow/Shrink Weight...' -Blender: 241 +Blender: 245 Group: 'WeightPaint' Tooltip: 'Grow/Shrink active vertex group.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ diff --git a/release/scripts/weightpaint_normalize.py b/release/scripts/weightpaint_normalize.py index 1f6c3d201aa..6059922eecb 100644 --- a/release/scripts/weightpaint_normalize.py +++ b/release/scripts/weightpaint_normalize.py @@ -1,13 +1,13 @@ #!BPY """ Name: 'Normalize/Scale Weight...' -Blender: 241 +Blender: 245 Group: 'WeightPaint' Tooltip: 'Normalize the weight of the active weightgroup.' """ -__author__ = ["Campbell Barton"] -__url__ = ("blender", "elysiun", "http://members.iinet.net.au/~cpbarton/ideasman/") +__author__ = "Campbell Barton aka ideasman42" +__url__ = ["www.blender.org", "blenderartists.org", "www.python.org"] __version__ = "0.1" __bpydoc__ = """\ diff --git a/release/scripts/widgetwizard.py b/release/scripts/widgetwizard.py index 8facf115d9e..a7ddd68268a 100644 --- a/release/scripts/widgetwizard.py +++ b/release/scripts/widgetwizard.py @@ -8,7 +8,7 @@ Tip: 'Adds Widgets for Driven Shapes' """ __author__ = ["Johnny Matthews (guitargeek)"] -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "0.0.9 12/15/05" __bpydoc__ = """\ diff --git a/release/scripts/xfig_export.py b/release/scripts/xfig_export.py index e8e0c0ded0e..ddc0dd4dcea 100644 --- a/release/scripts/xfig_export.py +++ b/release/scripts/xfig_export.py @@ -7,7 +7,7 @@ Tooltip: 'Export selected mesh to xfig Format (.fig)' """ __author__ = 'Dino Ghilardi', 'Campbell Barton AKA Ideasman42' -__url__ = ("blender", "elysiun") +__url__ = ("blender", "blenderartists.org") __version__ = "1.1" __bpydoc__ = """\ diff --git a/release/scripts/xsi_export.py b/release/scripts/xsi_export.py index 62dc32cbc78..d86d8cb82cf 100644 --- a/release/scripts/xsi_export.py +++ b/release/scripts/xsi_export.py @@ -10,7 +10,7 @@ Tooltip: 'Export to a SoftImage XSI file' __author__ = ("Elira") __url__ = ["Author's site, http://www.creative-realms.net/~elira/blender.html", -"SoftImage's site, www.softimage.com", "elysiun"] +"SoftImage's site, www.softimage.com", "blenderartists.org"] __email__ = ["scripts"] __version__ = "2005/11/01" diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 7a5385def17..be790f6b9c1 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1372,7 +1372,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob) ob->mat = MEM_dupallocN(target->mat); for(i=0; i<target->totcol; i++) { /* dont need to run test_object_materials since we know this object is new and not used elsewhere */ - id_us_plus(ob->mat[i]); + id_us_plus((ID *)ob->mat[i]); } } diff --git a/source/blender/python/BPY_extern.h b/source/blender/python/BPY_extern.h index 41e8004e25b..f6a27b80733 100644 --- a/source/blender/python/BPY_extern.h +++ b/source/blender/python/BPY_extern.h @@ -84,7 +84,8 @@ extern "C" { void init_syspath( int first_time ); void syspath_append( char *dir ); void BPY_rebuild_syspath( void ); - + int BPY_path_update( void ); + int BPY_Err_getLinenumber( void ); const char *BPY_Err_getFilename( void ); diff --git a/source/blender/python/BPY_interface.c b/source/blender/python/BPY_interface.c index 9bdb4425766..9d1d0e0f7d6 100644 --- a/source/blender/python/BPY_interface.c +++ b/source/blender/python/BPY_interface.c @@ -462,6 +462,16 @@ void BPY_rebuild_syspath( void ) PyGILState_Release(gilstate); } +int BPY_path_update( void ) +{ + BPyMenu_RemoveAllEntries(); /* free old data */ + BPY_rebuild_syspath(); + if (BPyMenu_Init(1) == -1) { /* re-eval scripts registration in menus */ + return 0; + } + return 1; +} + /**************************************************************************** * Description: This function finishes Python initialization in Blender. diff --git a/source/blender/python/api2_2x/doc/API_related.py b/source/blender/python/api2_2x/doc/API_related.py index 87b29e7f524..4e29f95e76d 100644 --- a/source/blender/python/api2_2x/doc/API_related.py +++ b/source/blender/python/api2_2x/doc/API_related.py @@ -351,8 +351,8 @@ Introduction: expected format for each url entry is e.g. "Author's site, http://www.somewhere.com". The first part, before the comma (','), is used as the button's tooltip. There are two preset - options: "blender" and "elysiun", which link to the Python forums at - blender.org and elysiun.com, respectively. + options: "blender" and "blenderartists.org", which link to the Python forums at + blender.org and blenderartists.org, respectively. - __email__ (optional, type: string or list of strings): - Equivalent to __url__, but opens the user's default email client. You @@ -369,7 +369,7 @@ Introduction: __author__ = 'Mr. Author' __version__ = '1.0 2005/01/01' __url__ = ["Author's site, http://somewhere.com", - "Support forum, http://somewhere.com/forum/", "blender", "elysiun"] + "Support forum, http://somewhere.com/forum/", "blender", "blenderartists.org"] __email__ = ["Mr. Author, mrauthor:somewhere*com", "scripts"] __bpydoc__ = \"\"\"\\ This script does this and that. diff --git a/source/blender/src/header_script.c b/source/blender/src/header_script.c index f0a042f27c0..3c96e1692bf 100644 --- a/source/blender/src/header_script.c +++ b/source/blender/src/header_script.c @@ -112,9 +112,9 @@ static void do_script_scriptsmenu(void *arg, int event) /* these are no defines, easier this way, the codes are in the function below */ switch(event) { case 0: /* update menus */ - BPyMenu_RemoveAllEntries(); - BPY_rebuild_syspath(); - if (BPyMenu_Init(1) == -1) error("Invalid scripts dir: check console"); + if (BPY_path_update()==0) { + error("Invalid scripts dir: check console"); + } break; } diff --git a/source/blender/src/headerbuttons.c b/source/blender/src/headerbuttons.c index fcc1dcb42b4..b91a8f74f80 100644 --- a/source/blender/src/headerbuttons.c +++ b/source/blender/src/headerbuttons.c @@ -545,9 +545,9 @@ static void filesel_u_pythondir(char *name) allqueue(REDRAWALL, 0); /* act on the change */ - BPyMenu_RemoveAllEntries(); - BPY_rebuild_syspath(); - if (BPyMenu_Init(1) == -1) error("Invalid scripts dir: check console"); + if (BPY_path_update()==0) { + error("Invalid scripts dir: check console"); + } } static void filesel_u_sounddir(char *name) @@ -1525,9 +1525,7 @@ void do_global_buttons(unsigned short event) case B_PYMENUEVAL: /* is button from space.c *info* */ waitcursor( 1 ); /* can take some time */ - BPyMenu_RemoveAllEntries(); /* free old data */ - BPY_rebuild_syspath(); - if (BPyMenu_Init(1) == -1) { /* re-eval scripts registration in menus */ + if (BPY_path_update() == 0) { /* re-eval scripts registration in menus */ waitcursor( 0 ); error("Invalid scripts dir: check console"); } diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 36bb36e0642..dfcfc0d57f7 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -641,6 +641,10 @@ int BIF_read_homefile(int from_memory) BKE_reset_undo(); BKE_write_undo("original"); /* save current state */ + /* if from memory, need to refresh python scripts */ + if (from_memory) { + BPY_path_update(); + } return success; } |