use set as a suffix (matches operators)

 - set_frame() --> frame_set()
 - set_context_pointer() --> context_pointer_set()

material adding works for curves and metaballs, new function to remove materials.

materials.link() didnt well fit how this is used elsewhere
 - order matters
 - it can be linked more than once.
 - remove(material), isnt that useful since you need to manage indicies.

... use list style functions instead. materials.append(mat) / materials.pop(index)

14 files changed, 22 insertions, 23 deletions

diff --git a/release/scripts/op/io_anim_bvh/import_bvh.py b/release/scripts/op/io_anim_bvh/import_bvh.py
index befd6cdbe89..5f9de6cbd90 100644
--- a/release/scripts/op/io_anim_bvh/import_bvh.py
+++ b/release/scripts/op/io_anim_bvh/import_bvh.py
@@ -351,7 +351,7 @@ def bvh_node_dict2armature(context, bvh_nodes, ROT_MODE='XYZ', IMPORT_START_FRAM
     for ob in scn.objects:
         ob.select = False
 
-    scn.set_frame(IMPORT_START_FRAME)
+    scn.frame_set(IMPORT_START_FRAME)
 
     arm_data = bpy.data.armatures.new("MyBVH")
     arm_ob = bpy.data.objects.new("MyBVH", arm_data)
diff --git a/release/scripts/op/io_scene_3ds/import_3ds.py b/release/scripts/op/io_scene_3ds/import_3ds.py
index 5ea705f15f7..1f34d3738bd 100644
--- a/release/scripts/op/io_scene_3ds/import_3ds.py
+++ b/release/scripts/op/io_scene_3ds/import_3ds.py
@@ -240,7 +240,7 @@ def process_next_chunk(file, previous_chunk, importedObjects, IMAGE_SEARCH):
                     bmat = MATDICT[matName][1]
                     img = TEXTURE_DICT.get(bmat.name)
 
-                bmesh.materials.link(bmat) # can be None
+                bmesh.materials.append(bmat) # can be None
 
                 if uv_faces  and img:
                     for fidx in faces:
diff --git a/release/scripts/op/io_scene_fbx/export_fbx.py b/release/scripts/op/io_scene_fbx/export_fbx.py
index ec13decc026..51a5f86a5e4 100644
--- a/release/scripts/op/io_scene_fbx/export_fbx.py
+++ b/release/scripts/op/io_scene_fbx/export_fbx.py
@@ -1965,7 +1965,7 @@ def save(operator, context, filepath="", \
                     ob_base.update(scene)
 
             # This causes the makeDisplayList command to effect the mesh
-            scene.set_frame(scene.frame_current)
+            scene.frame_set(scene.frame_current)
 # 			Blender.Set('curframe', Blender.Get('curframe'))
 
 
@@ -2138,7 +2138,7 @@ def save(operator, context, filepath="", \
                 if ob_base.type == 'ARMATURE':
                     ob_base.update(scene)
             # This causes the makeDisplayList command to effect the mesh
-            scene.set_frame(scene.frame_current)
+            scene.frame_set(scene.frame_current)
 # 			Blender.Set('curframe', Blender.Get('curframe'))
 
     del tmp_ob_type, tmp_objects
@@ -2758,7 +2758,7 @@ Takes:  {''')
             '''
             i = act_start
             while i <= act_end:
-                scene.set_frame(i)
+                scene.frame_set(i)
 # 				Blender.Set('curframe', i)
                 for ob_generic in ob_anim_lists:
                     for my_ob in ob_generic:
@@ -2898,8 +2898,7 @@ Takes:  {''')
 
         file.write('\n}')
 
-        scene.set_frame(frame_orig)
-# 		Blender.Set('curframe', frame_orig)
+        scene.frame_set(frame_orig)
 
     else:
         # no animation
diff --git a/release/scripts/op/io_scene_obj/import_obj.py b/release/scripts/op/io_scene_obj/import_obj.py
index b21db8ae615..73b5484ff3a 100644
--- a/release/scripts/op/io_scene_obj/import_obj.py
+++ b/release/scripts/op/io_scene_obj/import_obj.py
@@ -593,7 +593,7 @@ def create_mesh(new_objects, has_ngons, CREATE_FGONS, CREATE_EDGES, verts_loc, v
 
     # make sure the list isnt too big
     for material in materials:
-        me.materials.link(material)
+        me.materials.append(material)
 
     me.vertices.add(len(verts_loc))
     me.faces.add(len(faces))
diff --git a/release/scripts/op/io_shape_mdd/export_mdd.py b/release/scripts/op/io_shape_mdd/export_mdd.py
index 1f0a5d94320..3c57ae5afa0 100644
--- a/release/scripts/op/io_shape_mdd/export_mdd.py
+++ b/release/scripts/op/io_shape_mdd/export_mdd.py
@@ -69,7 +69,7 @@ def save(operator, context, filepath="", frame_start=1, frame_end=300, fps=25):
         bpy.ops.object.mode_set(mode='OBJECT')
 
     orig_frame = scene.frame_current
-    scene.set_frame(frame_start)
+    scene.frame_set(frame_start)
     me = obj.create_mesh(scene, True, 'PREVIEW')
 
     #Flip y and z
@@ -108,7 +108,7 @@ def save(operator, context, filepath="", frame_start=1, frame_end=300, fps=25):
         me_tmp.getFromObject(obj.name)
         """
 
-        scene.set_frame(frame)
+        scene.frame_set(frame)
         me = obj.create_mesh(scene, True, 'PREVIEW')
         check_vertcount(me, numverts)
         me.transform(mat_flip * obj.matrix_world)
@@ -126,6 +126,6 @@ def save(operator, context, filepath="", frame_start=1, frame_end=300, fps=25):
     Blender.Window.WaitCursor(0)
     Blender.Set('curframe', orig_frame)
     """
-    scene.set_frame(orig_frame)
+    scene.frame_set(orig_frame)
     
     return {'FINISHED'}
diff --git a/release/scripts/op/nla.py b/release/scripts/op/nla.py
index cc48d39188a..27fd83c4482 100644
--- a/release/scripts/op/nla.py
+++ b/release/scripts/op/nla.py
@@ -87,7 +87,7 @@ def bake(frame_start, frame_end, step=1, only_selected=False):
 
     # could spped this up by applying steps here too...
     for f in frame_range:
-        scene.set_frame(f)
+        scene.frame_set(f)
 
         info = pose_info()
         info_ls.append(info)
diff --git a/release/scripts/ui/properties_object.py b/release/scripts/ui/properties_object.py
index 35037b10216..66189f62dbf 100644
--- a/release/scripts/ui/properties_object.py
+++ b/release/scripts/ui/properties_object.py
@@ -142,7 +142,7 @@ class OBJECT_PT_groups(ObjectButtonsPanel, bpy.types.Panel):
             if ob.name in group.objects:
                 col = layout.column(align=True)
 
-                col.set_context_pointer("group", group)
+                col.context_pointer_set("group", group)
 
                 row = col.box().row()
                 row.prop(group, "name", text="")
diff --git a/release/scripts/ui/properties_physics_cloth.py b/release/scripts/ui/properties_physics_cloth.py
index 4fd7fc97418..2e50babfcfd 100644
--- a/release/scripts/ui/properties_physics_cloth.py
+++ b/release/scripts/ui/properties_physics_cloth.py
@@ -63,7 +63,7 @@ class PHYSICS_PT_cloth(PhysicButtonsPanel, bpy.types.Panel):
 
         if md:
             # remove modifier + settings
-            split.set_context_pointer("modifier", md)
+            split.context_pointer_set("modifier", md)
             split.operator("object.modifier_remove", text="Remove")
 
             row = split.row(align=True)
diff --git a/release/scripts/ui/properties_physics_common.py b/release/scripts/ui/properties_physics_common.py
index c4692635ee7..68b93386099 100644
--- a/release/scripts/ui/properties_physics_common.py
+++ b/release/scripts/ui/properties_physics_common.py
@@ -26,7 +26,7 @@ import bpy
 def point_cache_ui(self, context, cache, enabled, cachetype):
     layout = self.layout
 
-    layout.set_context_pointer("point_cache", cache)
+    layout.context_pointer_set("point_cache", cache)
 
     row = layout.row()
     row.template_list(cache, "point_caches", cache.point_caches, "active_index", rows=2)
diff --git a/release/scripts/ui/properties_physics_field.py b/release/scripts/ui/properties_physics_field.py
index 07d748e8c28..a72103f5132 100644
--- a/release/scripts/ui/properties_physics_field.py
+++ b/release/scripts/ui/properties_physics_field.py
@@ -175,7 +175,7 @@ class PHYSICS_PT_collision(PhysicButtonsPanel, bpy.types.Panel):
 
         if md:
             # remove modifier + settings
-            split.set_context_pointer("modifier", md)
+            split.context_pointer_set("modifier", md)
             split.operator("object.modifier_remove", text="Remove")
             col = split.column()
 
diff --git a/release/scripts/ui/properties_physics_fluid.py b/release/scripts/ui/properties_physics_fluid.py
index 18c0204f993..dcdb2de8b52 100644
--- a/release/scripts/ui/properties_physics_fluid.py
+++ b/release/scripts/ui/properties_physics_fluid.py
@@ -44,7 +44,7 @@ class PHYSICS_PT_fluid(PhysicButtonsPanel, bpy.types.Panel):
 
         if md:
             # remove modifier + settings
-            split.set_context_pointer("modifier", md)
+            split.context_pointer_set("modifier", md)
             split.operator("object.modifier_remove", text="Remove")
 
             row = split.row(align=True)
diff --git a/release/scripts/ui/properties_physics_smoke.py b/release/scripts/ui/properties_physics_smoke.py
index cf91705318e..1db6785f36f 100644
--- a/release/scripts/ui/properties_physics_smoke.py
+++ b/release/scripts/ui/properties_physics_smoke.py
@@ -49,7 +49,7 @@ class PHYSICS_PT_smoke(PhysicButtonsPanel, bpy.types.Panel):
 
         if md:
             # remove modifier + settings
-            split.set_context_pointer("modifier", md)
+            split.context_pointer_set("modifier", md)
             split.operator("object.modifier_remove", text="Remove")
 
             row = split.row(align=True)
diff --git a/release/scripts/ui/properties_physics_softbody.py b/release/scripts/ui/properties_physics_softbody.py
index b9c4c87c78d..08abf048c50 100644
--- a/release/scripts/ui/properties_physics_softbody.py
+++ b/release/scripts/ui/properties_physics_softbody.py
@@ -55,7 +55,7 @@ class PHYSICS_PT_softbody(PhysicButtonsPanel, bpy.types.Panel):
 
         if md:
             # remove modifier + settings
-            split.set_context_pointer("modifier", md)
+            split.context_pointer_set("modifier", md)
             split.operator("object.modifier_remove", text="Remove")
 
             row = split.row(align=True)
diff --git a/release/scripts/ui/space_userpref_keymap.py b/release/scripts/ui/space_userpref_keymap.py
index 3d76c014694..d77acabd66b 100644
--- a/release/scripts/ui/space_userpref_keymap.py
+++ b/release/scripts/ui/space_userpref_keymap.py
@@ -161,7 +161,7 @@ class InputKeyMapPanel(bpy.types.Panel):
     def draw_km(self, display_keymaps, kc, km, children, layout, level):
         km = km.active()
 
-        layout.set_context_pointer("keymap", km)
+        layout.context_pointer_set("keymap", km)
 
         col = self.indented_layout(layout, level)
 
@@ -315,12 +315,12 @@ class InputKeyMapPanel(bpy.types.Panel):
                 kmm = kc.keymaps.find_modal(kmi.idname)
                 if kmm:
                     self.draw_km(display_keymaps, kc, kmm, None, layout, level + 1)
-                    layout.set_context_pointer("keymap", km)
+                    layout.context_pointer_set("keymap", km)
 
     def draw_filtered(self, display_keymaps, filter_text, layout):
         for km, kc in display_keymaps:
             km = km.active()
-            layout.set_context_pointer("keymap", km)
+            layout.context_pointer_set("keymap", km)
 
             filtered_items = [kmi for kmi in km.items if filter_text in kmi.name.lower()]
 
@@ -364,7 +364,7 @@ class InputKeyMapPanel(bpy.types.Panel):
 
         row = subcol.row()
         row.prop_search(wm.keyconfigs, "active", wm, "keyconfigs", text="Key Config:")
-        layout.set_context_pointer("keyconfig", wm.keyconfigs.active)
+        layout.context_pointer_set("keyconfig", wm.keyconfigs.active)
         row.operator("wm.keyconfig_remove", text="", icon='X')
 
         row.prop(context.space_data, "filter_text", icon="VIEWZOOM")