[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24984] trunk/blender/release/scripts: simple fixes

[Campbell Barton]

Revision: 24984
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24984
Author:   campbellbarton
Date:     2009-11-28 21:50:31 +0100 (Sat, 28 Nov 2009)

Log Message:
-----------
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="_")

Modified Paths:
--------------
    trunk/blender/release/scripts/io/export_obj.py
    trunk/blender/release/scripts/modules/bpy/utils.py
    trunk/blender/release/scripts/ui/space_view3d.py

Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py	2009-11-28 20:26:22 UTC (rev 24983)
+++ trunk/blender/release/scripts/io/export_obj.py	2009-11-28 20:50:31 UTC (rev 24984)
@@ -85,19 +85,6 @@
 	else:
 		return name.replace(' ', '_')
 
-
-# this used to be in BPySys module
-# frankly, I don't understand how it works
-def BPySys_cleanName(name):
-
-	v = [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]
-
-	invalid = ''.join([chr(i) for i in v])
-
-	for ch in invalid:
-		name = name.replace(ch, '_')
-	return name
-
 # A Dict of Materials
 # (material.name, image.name):matname_imagename # matname_imagename has gaps removed.
 MTL_DICT = {} 	
@@ -884,7 +871,7 @@
 		orig_frame = scn.current_frame
 		
 		if EXPORT_ALL_SCENES: # Add scene name into the context_name
-			context_name[1] = '_%s' % BPySys_cleanName(scn.name) # WARNING, its possible that this could cause a collision. we could fix if were feeling parranoied.
+			context_name[1] = '_%s' % bpy.utils.clean_name(scn.name) # WARNING, its possible that this could cause a collision. we could fix if were feeling parranoied.
 		
 		# Export an animation?
 		if EXPORT_ANIMATION:
@@ -998,10 +985,10 @@
 		wm.add_fileselect(self)
 		return ('RUNNING_MODAL',)
 	
-	def poll(self, context): # Poll isnt working yet
-		print("Poll")
-		return context.active_object != None
 
+
+
+
 bpy.ops.add(ExportOBJ)
 
 import dynamic_menu
@@ -1021,4 +1008,4 @@
 # - NURBS - needs API additions
 # - all scenes export
 # + normals calculation
-# - get rid of cleanName somehow
+

Modified: trunk/blender/release/scripts/modules/bpy/utils.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy/utils.py	2009-11-28 20:26:22 UTC (rev 24983)
+++ trunk/blender/release/scripts/modules/bpy/utils.py	2009-11-28 20:50:31 UTC (rev 24984)
@@ -25,6 +25,33 @@
 
     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), )

Modified: trunk/blender/release/scripts/ui/space_view3d.py
===================================================================
--- trunk/blender/release/scripts/ui/space_view3d.py	2009-11-28 20:26:22 UTC (rev 24983)
+++ trunk/blender/release/scripts/ui/space_view3d.py	2009-11-28 20:50:31 UTC (rev 24984)
@@ -592,7 +592,6 @@
         layout.menu("VIEW3D_MT_make_links", text="Make Links...")
         layout.operator_menu_enum("object.make_local", "type", text="Make Local...")
         layout.menu("VIEW3D_MT_make_single_user")
-        layout.menu("VIEW3D_MT_make_links")
 
         layout.separator()