simple fixes

[#20123] "Import" menu entry becomes empty
[#20141] In Object menu Make Links appears twice - SVN 24970

also moved OBJs name cleaning func to bpy.utils.clean_name(name, replace="_")

1 files changed, 27 insertions, 0 deletions

diff --git a/release/scripts/modules/bpy/utils.py b/release/scripts/modules/bpy/utils.py
index a2c6f764e3b..a10c8bc4dd9 100644
--- a/release/scripts/modules/bpy/utils.py
+++ b/release/scripts/modules/bpy/utils.py
@@ -25,6 +25,33 @@ def expandpath(path):
 
     return path
 
+
+_unclean_chars = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, \
+    17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, \
+    35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 46, 47, 58, 59, 60, 61, 62, 63, \
+    64, 91, 92, 93, 94, 96, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, \
+    133, 134, 135, 136, 137, 138, 139, 140, 141, 142, 143, 144, 145, 146, \
+    147, 148, 149, 150, 151, 152, 153, 154, 155, 156, 157, 158, 159, 160, \
+    161, 162, 163, 164, 165, 166, 167, 168, 169, 170, 171, 172, 173, 174, \
+    175, 176, 177, 178, 179, 180, 181, 182, 183, 184, 185, 186, 187, 188, \
+    189, 190, 191, 192, 193, 194, 195, 196, 197, 198, 199, 200, 201, 202, \
+    203, 204, 205, 206, 207, 208, 209, 210, 211, 212, 213, 214, 215, 216, \
+    217, 218, 219, 220, 221, 222, 223, 224, 225, 226, 227, 228, 229, 230, \
+    231, 232, 233, 234, 235, 236, 237, 238, 239, 240, 241, 242, 243, 244, \
+    245, 246, 247, 248, 249, 250, 251, 252, 253, 254]
+
+_unclean_chars = ''.join([chr(i) for i in _unclean_chars])
+
+def clean_name(name, replace="_"):
+    '''
+    All characters besides A-Z/a-z, 0-9 are replaced with "_"
+    or the replace argumet if defined.
+    '''
+    for ch in _unclean_chars:
+        name = name.replace(ch,  replace)
+    return name
+
+
 # base scripts
 _scripts = os.path.join(os.path.dirname(__file__), os.path.pardir, os.path.pardir)
 _scripts = (os.path.normpath(_scripts), )