Updating own scripts to use Blender.Main, remove Base files.

15 files changed, 21 insertions, 22 deletions

diff --git a/release/scripts/3ds_export.py b/release/scripts/3ds_export.py
index 15079130939..2ea6efc2080 100644
--- a/release/scripts/3ds_export.py
+++ b/release/scripts/3ds_export.py
@@ -877,7 +877,7 @@ def save_3ds(filename):
 	
 	time1= Blender.sys.time()
 	Blender.Window.WaitCursor(1)
-	scn= Blender.Scene.GetCurrent()
+	scn= Blender.Main.scenes.active
 	
 	# Initialize the main chunk (primary):
 	primary = _3ds_chunk(PRIMARY)
diff --git a/release/scripts/3ds_import.py b/release/scripts/3ds_import.py
index 56525d56611..cf4c5e511c3 100644
--- a/release/scripts/3ds_import.py
+++ b/release/scripts/3ds_import.py
@@ -117,7 +117,7 @@ Loader is based on 3ds loader from www.gametutorials.com (Thanks DigiBen).
 # Importing modules
 
 import Blender
-from Blender import Mesh, Scene, Object, Material, Image, Texture, Lamp, Mathutils
+from Blender import Mesh, Main, Object, Material, Image, Texture, Lamp, Mathutils
 from Blender.Mathutils import Vector
 import BPyImage
 
@@ -809,7 +809,7 @@ def load_3ds(filename, PREF_UI= True):
 	
 	##IMAGE_SEARCH
 	
-	scn= Scene.GetCurrent()
+	scn= Main.scenes.active
 	SCN_OBJECTS = scn.objects
 	SCN_OBJECTS.selected = [] # de select all
 	
diff --git a/release/scripts/armature_symmetry.py b/release/scripts/armature_symmetry.py
index b4b3e54516c..85e4d1a3afe 100644
--- a/release/scripts/armature_symmetry.py
+++ b/release/scripts/armature_symmetry.py
@@ -39,7 +39,7 @@ Hidden bones are ignored, and optionally only operate on selected bones.
 # --------------------------------------------------------------------------
 
 import Blender
-from Blender import Scene
+from Blender import Main
 Vector= Blender.Mathutils.Vector
 
 
@@ -248,7 +248,7 @@ def main():
 	User interface function that gets the options and calls armature_symetry()
 	'''
 	
-	scn= Scene.GetCurrent()
+	scn= Main.scenes.active
 	arm_ob= scn.objects.active
 	
 	if not arm_ob or arm_ob.type!='Armature':
diff --git a/release/scripts/bpymodules/BPyMesh.py b/release/scripts/bpymodules/BPyMesh.py
index 91f0348549d..8aec94ca555 100644
--- a/release/scripts/bpymodules/BPyMesh.py
+++ b/release/scripts/bpymodules/BPyMesh.py
@@ -384,7 +384,7 @@ def getMeshFromObject(ob, container_mesh=None, apply_modifiers=True, vgroups=Tru
 	'''
 	
 	if not scn:
-		scn= Blender.Scene.GetCurrent()
+		scn= Blender.Main.scenes.active
 	if not container_mesh:
 		mesh = Blender.Mesh.New()	
 	else:
diff --git a/release/scripts/bpymodules/BPyMesh_redux.py b/release/scripts/bpymodules/BPyMesh_redux.py
index 581c10f1ec5..86a2975caba 100644
--- a/release/scripts/bpymodules/BPyMesh_redux.py
+++ b/release/scripts/bpymodules/BPyMesh_redux.py
@@ -642,8 +642,8 @@ def redux(ob, REDUX=0.5, BOUNDRY_WEIGHT=2.0, REMOVE_DOUBLES=False, FACE_AREA_WEI
 # Example usage
 def main():
 	Blender.Window.EditMode(0)
-	scn= Blender.Scene.GetCurrent()
-	active_ob= scn.getActiveObject()
+	scn= Blender.Main.scenes.active
+	active_ob= scn.objects.active
 	t= Blender.sys.time()
 	redux(active_ob, 0.5)
 	print '%.4f' % (Blender.sys.time()-t)
diff --git a/release/scripts/bvh_import.py b/release/scripts/bvh_import.py
index 7b0c3928cbb..0b6effe44be 100644
--- a/release/scripts/bvh_import.py
+++ b/release/scripts/bvh_import.py
@@ -310,7 +310,7 @@ def bvh_node_dict2objects(bvh_nodes, IMPORT_START_FRAME= 1):
 	if IMPORT_START_FRAME<1:
 		IMPORT_START_FRAME= 1
 		
-	scn= Blender.Scene.GetCurrent()
+	scn= Blender.Main.scenes.active
 	scn.objects.selected = []
 	
 	objects= []
@@ -441,7 +441,7 @@ def bvh_node_dict2armature(bvh_nodes, IMPORT_START_FRAME= 1):
 	
 	
 	
-	scn= Blender.Scene.GetCurrent()
+	scn= Blender.Main.scenes.active
 	
 	scn.objects.selected = []
 	
@@ -731,7 +731,7 @@ def main():
 if __name__ == '__main__':
 	main()
 	'''
-	scn = Blender.Scene.GetCurrent()
+	scn = Blender.Main.scenes.active
 	for ob in list(scn.objects): scn.objects.unlink(ob)
 	load_bvh_ui('/test.bvh', False)
 	'''
diff --git a/release/scripts/mesh_skin.py b/release/scripts/mesh_skin.py
index a8a74eeb24d..7c38e8a8b79 100644
--- a/release/scripts/mesh_skin.py
+++ b/release/scripts/mesh_skin.py
@@ -520,7 +520,7 @@ def main():
 	
 	is_editmode = Window.EditMode()
 	if is_editmode: Window.EditMode(0)
-	ob = Blender.Scene.GetCurrent().objects.active
+	ob = Blender.Main.scenes.objects.active
 	if ob == None or ob.type != 'Mesh':
 		BPyMessages.Error_NoMeshActive()
 		return
diff --git a/release/scripts/mesh_solidify.py b/release/scripts/mesh_solidify.py
index fd72af4e658..dca45b9c377 100644
--- a/release/scripts/mesh_solidify.py
+++ b/release/scripts/mesh_solidify.py
@@ -100,7 +100,7 @@ def lengthFromAngle(angle):
 
 
 def main():
-	scn = Scene.GetCurrent()
+	scn = Main.scenes.active
 	ob = scn.objects.active
 	
 	if not ob or ob.type != 'Mesh':
diff --git a/release/scripts/object_apply_def.py b/release/scripts/object_apply_def.py
index 3046f0fea78..77dff67acb9 100644
--- a/release/scripts/object_apply_def.py
+++ b/release/scripts/object_apply_def.py
@@ -85,7 +85,7 @@ def copy_vgroups(source_ob, target_ob):
 
 
 def apply_deform():
-	scn= Blender.Scene.GetCurrent()
+	scn= Blender.Main.scenes.active
 	#Blender.Window.EditMode(0)
 	
 	NAME_LENGTH = 19
diff --git a/release/scripts/object_batch_name_edit.py b/release/scripts/object_batch_name_edit.py
index 812eee9dfe6..eff43e05fa8 100644
--- a/release/scripts/object_batch_name_edit.py
+++ b/release/scripts/object_batch_name_edit.py
@@ -46,7 +46,7 @@ from Blender import *
 
 global renameCount
 renameCount = 0
-obsel = Scene.GetCurrent().objects.context
+obsel = Main.scenes.active.objects.context
 
 def setDataNameWrapper(ob, newname):
 	if ob.getData(name_only=1) == newname:
diff --git a/release/scripts/uvcalc_follow_active_coords.py b/release/scripts/uvcalc_follow_active_coords.py
index d9a0d8c0c18..c932106a751 100644
--- a/release/scripts/uvcalc_follow_active_coords.py
+++ b/release/scripts/uvcalc_follow_active_coords.py
@@ -43,7 +43,7 @@ import BPyMesh
 reload(BPyMesh)
 
 def extend():
-	scn = Scene.GetCurrent()
+	scn = Main.scenes.active
 	ob = scn.objects.active
 	
 	# print ob, ob.type
diff --git a/release/scripts/uvcalc_from_adjacent.py b/release/scripts/uvcalc_from_adjacent.py
index a476d4f110c..ccf24c4ac52 100644
--- a/release/scripts/uvcalc_from_adjacent.py
+++ b/release/scripts/uvcalc_from_adjacent.py
@@ -70,7 +70,7 @@ def mostUsedImage(imageList): # Returns the image most used in the list.
 
 
 def main():
-	scn = Scene.GetCurrent()
+	scn = Main.scenes.active
 	ob = scn.objects.active
 	if ob == None or ob.type != 'Mesh':
 		Draw.PupMenu('ERROR: No mesh object in face select mode.')
diff --git a/release/scripts/uvcalc_lightmap.py b/release/scripts/uvcalc_lightmap.py
index 37c34c68710..b3a2bcfd9bf 100644
--- a/release/scripts/uvcalc_lightmap.py
+++ b/release/scripts/uvcalc_lightmap.py
@@ -466,7 +466,7 @@ def lightmap_uvpack(me, BOX_DIV = 8, MARGIN_DIV = 512):
 
 
 def main():
-	scn = Scene.GetCurrent()
+	scn = Main.scenes.active
 	ob = scn.objects.active
 	
 	# print ob, ob.type
diff --git a/release/scripts/uvcalc_quad_clickproj.py b/release/scripts/uvcalc_quad_clickproj.py
index 734306e2855..dfaf653ecf3 100644
--- a/release/scripts/uvcalc_quad_clickproj.py
+++ b/release/scripts/uvcalc_quad_clickproj.py
@@ -74,7 +74,7 @@ def mousedown_wait():
 
 def main():
 	
-	scn = Scene.GetCurrent()
+	scn = Blender.Main.scenes.active
 	ob = scn.objects.active
 	if not ob or ob.type!='Mesh':
 		return
diff --git a/release/scripts/uvcalc_smart_project.py b/release/scripts/uvcalc_smart_project.py
index 775594a1bb4..d805cbf3f06 100644
--- a/release/scripts/uvcalc_smart_project.py
+++ b/release/scripts/uvcalc_smart_project.py
@@ -42,7 +42,7 @@ selected faces, or all faces.
 # -------------------------------------------------------------------------- 
 
 
-from Blender import Object, Scene, Draw, Window, sys, Mesh, Geometry
+from Blender import Object, Draw, Window, sys, Mesh, Geometry
 from Blender.Mathutils import CrossVecs, Matrix, Vector, RotationMatrix, DotVecs
 
 from math import cos
@@ -833,12 +833,11 @@ def main():
 	global USER_STRETCH_ASPECT
 	global USER_ISLAND_MARGIN
 	
-	objects= Scene.GetCurrent().objects
+	objects= Main.scenes.active.objects
 	
 	# Use datanames as kesy so as not to unwrap a mesh more then once.
 	obList =  dict([(ob.getData(name_only=1), ob) for ob in objects.context if ob.type == 'Mesh'])
 	
-	
 	# Face select object may not be selected.
 	ob = objects.active
 	if ob and ob.sel == 0 and ob.type == 'Mesh':