[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31737] trunk/blender: use set as a suffix (matches operators)

Campbell Barton ideasman42 at gmail.com
Fri Sep 3 09:25:37 CEST 2010


Revision: 31737
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31737
Author:   campbellbarton
Date:     2010-09-03 09:25:37 +0200 (Fri, 03 Sep 2010)

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

Modified Paths:
--------------
    trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py
    trunk/blender/release/scripts/op/io_scene_3ds/import_3ds.py
    trunk/blender/release/scripts/op/io_scene_fbx/export_fbx.py
    trunk/blender/release/scripts/op/io_scene_obj/import_obj.py
    trunk/blender/release/scripts/op/io_shape_mdd/export_mdd.py
    trunk/blender/release/scripts/op/nla.py
    trunk/blender/release/scripts/ui/properties_object.py
    trunk/blender/release/scripts/ui/properties_physics_cloth.py
    trunk/blender/release/scripts/ui/properties_physics_common.py
    trunk/blender/release/scripts/ui/properties_physics_field.py
    trunk/blender/release/scripts/ui/properties_physics_fluid.py
    trunk/blender/release/scripts/ui/properties_physics_smoke.py
    trunk/blender/release/scripts/ui/properties_physics_softbody.py
    trunk/blender/release/scripts/ui/space_userpref_keymap.py
    trunk/blender/source/blender/blenkernel/BKE_material.h
    trunk/blender/source/blender/blenkernel/intern/material.c
    trunk/blender/source/blender/editors/mesh/mesh_data.c
    trunk/blender/source/blender/makesdna/intern/makesdna.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/makesrna/intern/rna_mesh.c
    trunk/blender/source/blender/makesrna/intern/rna_meta.c
    trunk/blender/source/blender/makesrna/intern/rna_scene_api.c
    trunk/blender/source/blender/makesrna/intern/rna_ui_api.c

Modified: trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py
===================================================================
--- trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/op/io_anim_bvh/import_bvh.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -351,7 +351,7 @@
     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)

Modified: trunk/blender/release/scripts/op/io_scene_3ds/import_3ds.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_3ds/import_3ds.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/op/io_scene_3ds/import_3ds.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -240,7 +240,7 @@
                     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:

Modified: trunk/blender/release/scripts/op/io_scene_fbx/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_fbx/export_fbx.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/op/io_scene_fbx/export_fbx.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -1965,7 +1965,7 @@
                     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 @@
                 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 @@
             '''
             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 @@
 
         file.write('\n}')
 
-        scene.set_frame(frame_orig)
-# 		Blender.Set('curframe', frame_orig)
+        scene.frame_set(frame_orig)
 
     else:
         # no animation

Modified: trunk/blender/release/scripts/op/io_scene_obj/import_obj.py
===================================================================
--- trunk/blender/release/scripts/op/io_scene_obj/import_obj.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/op/io_scene_obj/import_obj.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -593,7 +593,7 @@
 
     # 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))

Modified: trunk/blender/release/scripts/op/io_shape_mdd/export_mdd.py
===================================================================
--- trunk/blender/release/scripts/op/io_shape_mdd/export_mdd.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/op/io_shape_mdd/export_mdd.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -69,7 +69,7 @@
         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 @@
         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 @@
     Blender.Window.WaitCursor(0)
     Blender.Set('curframe', orig_frame)
     """
-    scene.set_frame(orig_frame)
+    scene.frame_set(orig_frame)
     
     return {'FINISHED'}

Modified: trunk/blender/release/scripts/op/nla.py
===================================================================
--- trunk/blender/release/scripts/op/nla.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/op/nla.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -87,7 +87,7 @@
 
     # 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)

Modified: trunk/blender/release/scripts/ui/properties_object.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_object.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_object.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -142,7 +142,7 @@
             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="")

Modified: trunk/blender/release/scripts/ui/properties_physics_cloth.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_cloth.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_physics_cloth.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -63,7 +63,7 @@
 
         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)

Modified: trunk/blender/release/scripts/ui/properties_physics_common.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_common.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_physics_common.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -26,7 +26,7 @@
 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)

Modified: trunk/blender/release/scripts/ui/properties_physics_field.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_field.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_physics_field.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -175,7 +175,7 @@
 
         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()
 

Modified: trunk/blender/release/scripts/ui/properties_physics_fluid.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_fluid.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_physics_fluid.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -44,7 +44,7 @@
 
         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)

Modified: trunk/blender/release/scripts/ui/properties_physics_smoke.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_smoke.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_physics_smoke.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -49,7 +49,7 @@
 
         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)

Modified: trunk/blender/release/scripts/ui/properties_physics_softbody.py
===================================================================
--- trunk/blender/release/scripts/ui/properties_physics_softbody.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/properties_physics_softbody.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -55,7 +55,7 @@
 
         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)

Modified: trunk/blender/release/scripts/ui/space_userpref_keymap.py
===================================================================
--- trunk/blender/release/scripts/ui/space_userpref_keymap.py	2010-09-03 06:18:23 UTC (rev 31736)
+++ trunk/blender/release/scripts/ui/space_userpref_keymap.py	2010-09-03 07:25:37 UTC (rev 31737)
@@ -161,7 +161,7 @@
     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 @@
                 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:

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list