update for changes in rna

8 files changed, 22 insertions, 32 deletions

diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py
index 1f12cc73..91bf74a9 100644
--- a/io_export_unreal_psk_psa.py
+++ b/io_export_unreal_psk_psa.py
@@ -735,10 +735,10 @@ def parse_meshes(blender_meshes, psk_file):
 				if len(current_mesh.uv_textures) > 0:
 					has_UV = True	
 					#print("face index: ",face_index)
-					#faceUV = current_mesh.active_uv_texture.data[face_index]#UVs for current face
-					#faceUV = current_mesh.active_uv_texture.data[0]#UVs for current face
+					#faceUV = current_mesh.uv_textures.active.data[face_index]#UVs for current face
+					#faceUV = current_mesh.uv_textures.active.data[0]#UVs for current face
 					#print(face_index,"<[FACE NUMBER")
-					uv_layer = current_mesh.active_uv_texture
+					uv_layer = current_mesh.uv_textures.active
 					faceUV = uv_layer.data[face_index]
 					#print("============================")
 					#size(data) is number of texture faces. Each face has UVs
diff --git a/io_import_images_as_planes.py b/io_import_images_as_planes.py
index 36e13d97..87f0c6c6 100644
--- a/io_import_images_as_planes.py
+++ b/io_import_images_as_planes.py
@@ -136,7 +136,7 @@ def createPlaneObj(img, dimension):
     me.update()
 
     plane = bpy.data.objects.new(img.name, me)
-    plane.data.add_uv_texture()
+    plane.data.uv_textures.new()
 
     scene.objects.link(plane)
     plane.location = scene.cursor_location
diff --git a/io_import_scene_mhx.py b/io_import_scene_mhx.py
index 8c55c262..a669327b 100644
--- a/io_import_scene_mhx.py
+++ b/io_import_scene_mhx.py
@@ -229,19 +229,13 @@ Plural = {
 
 def uvtexCreator(me, name):
 	print("uvtexCreator", me, name)
-	me.add_uv_texture()
-	uvtex = me.uv_textures[-1]
-	uvtex.name = name
-	return uvtex
+	return me.uv_textures.new(name)
 
 
 def vertcolCreator(me, name):
 	print("vertcolCreator", me, name)
-	me.add_vertex_color()
-	vcol = me.vertex_colors[-1]
-	vcol.name = name
-	return vcol
-		
+	return me.vertex_colors.new(name)
+
 
 #
 #	loadMhx(filePath, context, flags):
@@ -1197,10 +1191,8 @@ def parseFaces2(tokens, me):
 #
 
 def parseUvTexture(args, tokens, me):
-	me.add_uv_texture()
-	uvtex = me.uv_textures[-1]
 	name = args[0]
-	uvtex.name = name
+	uvtex = me.uv_textures.new(name)
 	loadedData['MeshTextureFaceLayer'][name] = uvtex
 	for (key, val, sub) in tokens:
 		if key == 'Data':
@@ -1233,9 +1225,7 @@ def parseUvTexData(args, tokens, data):
 def parseVertColorLayer(args, tokens, me):
 	name = args[0]
 	print("VertColorLayer", name)
-	me.add_vertex_color()
-	vcol = me.vertex_colors[-1]
-	vcol.name = name
+	vcol = me.vertex_colors.new(name)
 	loadedData['MeshColorLayer'][name] = vcol
 	for (key, val, sub) in tokens:
 		if key == 'Data':
diff --git a/io_import_scene_unreal_psk.py b/io_import_scene_unreal_psk.py
index 3b518f1f..7e3a035d 100644
--- a/io_import_scene_unreal_psk.py
+++ b/io_import_scene_unreal_psk.py
@@ -499,13 +499,13 @@ def pskimport(infile):
 	texturename = "text1"
 	#print(dir(bpy.data))
 	if (len(faceuv) > 0):
-		me_ob.add_uv_texture() #add one uv texture
+		uvtex = me_ob.uv_textures.new() #add one uv texture
 		for i, face in enumerate(me_ob.faces):
-			blender_tface= me_ob.uv_textures[0].data[i] #face
+			blender_tface= uvtex.data[i] #face
 			blender_tface.uv1 = faceuv[i][0] #uv = (0,0)
 			blender_tface.uv2 = faceuv[i][1] #uv = (0,0)
 			blender_tface.uv3 = faceuv[i][2] #uv = (0,0)
-		texture.append(me_ob.uv_textures[0])
+		texture.append(uvtex)
 		
 		#for tex in me_ob.uv_textures:
 			#print("mesh tex:",dir(tex))
diff --git a/mesh_surface_sketch.py b/mesh_surface_sketch.py
index 5dee99da..47445743 100644
--- a/mesh_surface_sketch.py
+++ b/mesh_surface_sketch.py
@@ -790,8 +790,8 @@ def register():
     bpy.types.Scene.IntProperty(attr = "SURFSK_precision", name = "Precision", description = "Precision level of the surface calculation", default = 4, min = 0, max = 100000)
     bpy.types.Scene.BoolProperty(attr = "SURFSK_keep_strokes", name = "Keep strokes", description = "Keeps the sketched strokes after adding the surface", default = False)
 
-    keymap_item_add_surf = bpy.data.window_managers[0].active_keyconfig.keymaps["3D View"].items.add("GPENCIL_OT_SURFSK_add_surface","E","PRESS", key_modifier="D")
-    keymap_item_stroke_to_curve = bpy.data.window_managers[0].active_keyconfig.keymaps["3D View"].items.add("GPENCIL_OT_SURFSK_strokes_to_curves","C","PRESS", key_modifier="D")
+    keymap_item_add_surf = bpy.data.window_managers[0].keyconfigs.active.keymaps["3D View"].items.add("GPENCIL_OT_SURFSK_add_surface","E","PRESS", key_modifier="D")
+    keymap_item_stroke_to_curve = bpy.data.window_managers[0].keyconfigs.active.keymaps["3D View"].items.add("GPENCIL_OT_SURFSK_strokes_to_curves","C","PRESS", key_modifier="D")
 
 
 def unregister():
@@ -800,7 +800,7 @@ def unregister():
     bpy.types.Scene.RemoveProperty("SURFSK_precision")
     bpy.types.Scene.RemoveProperty("SURFSK_keep_strokes")
 
-    km = bpy.data.window_managers[0].active_keyconfig.keymaps["3D View"]
+    km = bpy.data.window_managers[0].keyconfigs.active.keymaps["3D View"]
     for kmi in km.items:
         if kmi.idname == 'wm.call_menu':
             if kmi.properties.name == "GPENCIL_OT_SURFSK_add_surface":
diff --git a/render_povray/render.py b/render_povray/render.py
index 704df32e..8fa1a1ec 100644
--- a/render_povray/render.py
+++ b/render_povray/render.py
@@ -290,12 +290,12 @@ def write_pov(filename, scene=None, info_callback=None):
 
             matrix = ob.matrix_world
             try:
-                uv_layer = me.active_uv_texture.data
+                uv_layer = me.uv_textures.active.data
             except:
                 uv_layer = None
 
             try:
-                vcol_layer = me.active_vertex_color.data
+                vcol_layer = me.vertex_colors.active.data
             except:
                 vcol_layer = None
 
diff --git a/space_view3d_materials_utils.py b/space_view3d_materials_utils.py
index 68e748d3..0a2abea3 100644
--- a/space_view3d_materials_utils.py
+++ b/space_view3d_materials_utils.py
@@ -432,7 +432,7 @@ def texface_to_mat():
         
         # get the texface images and store indices
         if (ob.data.uv_textures):
-            for f in ob.data.active_uv_texture.data:
+            for f in ob.data.uv_textures.active.data:
                 if f.image: 
                     img = f.image
                     #build list of unique images
@@ -669,12 +669,12 @@ class VIEW3D_MT_select_material(bpy.types.Menu):
 
 
 def register():
-    km = bpy.context.manager.active_keyconfig.keymaps['3D View']
+    km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
     kmi = km.items.add('wm.call_menu', 'Q', 'PRESS')
     kmi.properties.name = "VIEW3D_MT_master_material"
 
 def unregister():
-    km = bpy.context.manager.active_keyconfig.keymaps['3D View']
+    km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
     for kmi in km.items:
         if kmi.idname == 'wm.call_menu':
             if kmi.properties.name ==  "VIEW3D_MT_master_material":
diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py
index 45970915..64eab7cc 100644
--- a/space_view3d_spacebar_menu.py
+++ b/space_view3d_spacebar_menu.py
@@ -1451,13 +1451,13 @@ class VIEW3D_MT_undoS(bpy.types.Menu):
         layout.operator("ed.redo", icon='TRIA_RIGHT')
 
 def register():
-    km = bpy.context.manager.active_keyconfig.keymaps['3D View']
+    km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
     kmi = km.items.add('wm.call_menu', 'SPACE', 'PRESS')
     kmi.properties.name = "VIEW3D_MT_Space_Dynamic_Menu"
 
 
 def unregister():
-    km = bpy.context.manager.active_keyconfig.keymaps['3D View']
+    km = bpy.context.manager.keyconfigs.active.keymaps['3D View']
     for kmi in km.items:
         if kmi.idname == 'wm.call_menu':
             if kmi.properties.name == "VIEW3D_MT_Space_Dynamic_Menu":