[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31437] trunk/blender: rna renaming, still only adjusting properties that wont be animated ( at least its very unlikely).

Campbell Barton ideasman42 at gmail.com
Wed Aug 18 09:14:10 CEST 2010


Revision: 31437
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31437
Author:   campbellbarton
Date:     2010-08-18 09:14:10 +0200 (Wed, 18 Aug 2010)

Log Message:
-----------
rna renaming, still only adjusting properties that wont be animated (at least its very unlikely).

Modified Paths:
--------------
    trunk/blender/release/scripts/io/export_fbx.py
    trunk/blender/release/scripts/io/export_obj.py
    trunk/blender/release/scripts/io/export_ply.py
    trunk/blender/release/scripts/io/export_x3d.py
    trunk/blender/release/scripts/io/import_scene_obj.py
    trunk/blender/release/scripts/keyingsets/keyingsets_utils.py
    trunk/blender/release/scripts/modules/bpy_types.py
    trunk/blender/release/scripts/modules/rna_info.py
    trunk/blender/release/scripts/op/image.py
    trunk/blender/release/scripts/op/uvcalc_follow_active.py
    trunk/blender/release/scripts/op/uvcalc_smart_project.py
    trunk/blender/release/scripts/ui/properties_data_camera.py
    trunk/blender/release/scripts/ui/properties_data_curve.py
    trunk/blender/release/scripts/ui/properties_data_lattice.py
    trunk/blender/release/scripts/ui/properties_data_mesh.py
    trunk/blender/release/scripts/ui/properties_data_metaball.py
    trunk/blender/release/scripts/ui/properties_game.py
    trunk/blender/release/scripts/ui/properties_material.py
    trunk/blender/release/scripts/ui/properties_object.py
    trunk/blender/release/scripts/ui/properties_object_constraint.py
    trunk/blender/release/scripts/ui/properties_particle.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_scene.py
    trunk/blender/release/scripts/ui/space_filebrowser.py
    trunk/blender/release/scripts/ui/space_image.py
    trunk/blender/release/scripts/ui/space_sequencer.py
    trunk/blender/release/scripts/ui/space_text.py
    trunk/blender/release/scripts/ui/space_time.py
    trunk/blender/release/scripts/ui/space_userpref.py
    trunk/blender/release/scripts/ui/space_userpref_keymap.py
    trunk/blender/source/blender/blenkernel/intern/idcode.c
    trunk/blender/source/blender/editors/animation/fmodifier_ui.c
    trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/space_graph/graph_buttons.c
    trunk/blender/source/blender/editors/space_nla/nla_buttons.c
    trunk/blender/source/blender/makesrna/intern/rna_ID.c
    trunk/blender/source/blender/makesrna/intern/rna_action.c
    trunk/blender/source/blender/makesrna/intern/rna_animation.c
    trunk/blender/source/blender/makesrna/intern/rna_animviz.c
    trunk/blender/source/blender/makesrna/intern/rna_boid.c
    trunk/blender/source/blender/makesrna/intern/rna_camera.c
    trunk/blender/source/blender/makesrna/intern/rna_color.c
    trunk/blender/source/blender/makesrna/intern/rna_constraint.c
    trunk/blender/source/blender/makesrna/intern/rna_curve.c
    trunk/blender/source/blender/makesrna/intern/rna_fcurve.c
    trunk/blender/source/blender/makesrna/intern/rna_fluidsim.c
    trunk/blender/source/blender/makesrna/intern/rna_gpencil.c
    trunk/blender/source/blender/makesrna/intern/rna_group.c
    trunk/blender/source/blender/makesrna/intern/rna_image.c
    trunk/blender/source/blender/makesrna/intern/rna_key.c
    trunk/blender/source/blender/makesrna/intern/rna_lattice.c
    trunk/blender/source/blender/makesrna/intern/rna_main.c
    trunk/blender/source/blender/makesrna/intern/rna_material.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_nla.c
    trunk/blender/source/blender/makesrna/intern/rna_object.c
    trunk/blender/source/blender/makesrna/intern/rna_object_force.c
    trunk/blender/source/blender/makesrna/intern/rna_rna.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c
    trunk/blender/source/blender/makesrna/intern/rna_screen.c
    trunk/blender/source/blender/makesrna/intern/rna_smoke.c
    trunk/blender/source/blender/makesrna/intern/rna_sound.c
    trunk/blender/source/blender/makesrna/intern/rna_space.c
    trunk/blender/source/blender/makesrna/intern/rna_text.c
    trunk/blender/source/blender/makesrna/intern/rna_userdef.c
    trunk/blender/source/blender/makesrna/intern/rna_wm.c
    trunk/blender/source/blender/makesrna/rna_cleanup/rna_properties.txt

Modified: trunk/blender/release/scripts/io/export_fbx.py
===================================================================
--- trunk/blender/release/scripts/io/export_fbx.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/io/export_fbx.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -1519,7 +1519,7 @@
 
         # write loose edges as faces.
         for ed in me.edges:
-            if ed.loose:
+            if ed.is_loose:
                 ed_val = ed.vertices[:]
                 ed_val = ed_val[0], ed_val[-1] ^ -1
 
@@ -1584,11 +1584,11 @@
         i=-1
         for f in me.faces:
             if i==-1:
-                file.write('%i' % f.smooth);	i=0
+                file.write('%i' % f.use_smooth);	i=0
             else:
                 if i==54:
                     file.write('\n			 ');	i=0
-                file.write(',%i' % f.smooth)
+                file.write(',%i' % f.use_smooth)
             i+=1
 
         file.write('\n\t\t}')
@@ -1602,21 +1602,17 @@
             ReferenceInformationType: "Direct"
             Smoothing: ''')
 
-# 		SHARP = Blender.Mesh.EdgeFlags.SHARP
         i=-1
         for ed in me.edges:
             if i==-1:
-                file.write('%i' % (ed.sharp));	i=0
-# 				file.write('%i' % ((ed.flag&SHARP)!=0));	i=0
+                file.write('%i' % (ed.use_sharp));	i=0
             else:
                 if i==54:
                     file.write('\n			 ');	i=0
-                file.write(',%i' % (ed.sharp))
-# 				file.write(',%i' % ((ed.flag&SHARP)!=0))
+                file.write(',%i' % (ed.use_sharp))
             i+=1
 
         file.write('\n\t\t}')
-# 		del SHARP
 
         # small utility function
         # returns a slice of data depending on number of face verts

Modified: trunk/blender/release/scripts/io/export_obj.py
===================================================================
--- trunk/blender/release/scripts/io/export_obj.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/io/export_obj.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -496,24 +496,24 @@
             if EXPORT_KEEP_VERT_ORDER:
                 pass
             elif faceuv:
-                face_index_pairs.sort(key=lambda a: (a[0].material_index, hash(uv_layer[a[1]].image), a[0].smooth))
+                face_index_pairs.sort(key=lambda a: (a[0].material_index, hash(uv_layer[a[1]].image), a[0].use_smooth))
             elif len(materials) > 1:
-                face_index_pairs.sort(key = lambda a: (a[0].material_index, a[0].smooth))
+                face_index_pairs.sort(key = lambda a: (a[0].material_index, a[0].use_smooth))
             else:
                 # no materials
-                face_index_pairs.sort(key = lambda a: a[0].smooth)
+                face_index_pairs.sort(key = lambda a: a[0].use_smooth)
 #           if EXPORT_KEEP_VERT_ORDER:
 #               pass
 #           elif faceuv:
-#               try:    faces.sort(key = lambda a: (a.mat, a.image, a.smooth))
-#               except: faces.sort(lambda a,b: cmp((a.mat, a.image, a.smooth), (b.mat, b.image, b.smooth)))
+#               try:    faces.sort(key = lambda a: (a.mat, a.image, a.use_smooth))
+#               except: faces.sort(lambda a,b: cmp((a.mat, a.image, a.use_smooth), (b.mat, b.image, b.use_smooth)))
 #           elif len(materials) > 1:
-#               try:    faces.sort(key = lambda a: (a.mat, a.smooth))
-#               except: faces.sort(lambda a,b: cmp((a.mat, a.smooth), (b.mat, b.smooth)))
+#               try:    faces.sort(key = lambda a: (a.mat, a.use_smooth))
+#               except: faces.sort(lambda a,b: cmp((a.mat, a.use_smooth), (b.mat, b.use_smooth)))
 #           else:
 #               # no materials
-#               try:    faces.sort(key = lambda a: a.smooth)
-#               except: faces.sort(lambda a,b: cmp(a.smooth, b.smooth))
+#               try:    faces.sort(key = lambda a: a.use_smooth)
+#               except: faces.sort(lambda a,b: cmp(a.use_smooth, b.use_smooth))
 
             # Set the default mat to no material and no image.
             contextMat = (0, 0) # Can never be this, so we will label a new material teh first chance we get.
@@ -559,7 +559,7 @@
             # NORMAL, Smooth/Non smoothed.
             if EXPORT_NORMALS:
                 for f, f_index in face_index_pairs:
-                    if f.smooth:
+                    if f.use_smooth:
                         for v_idx in f.vertices:
                             v = me_verts[v_idx]
                             noKey = veckey3d(v.normal)
@@ -600,7 +600,7 @@
                 #   f_v.pop()
 
 #               f_v= f.v
-                f_smooth= f.smooth
+                f_smooth= f.use_smooth
                 f_mat = min(f.material_index, len(materialNames)-1)
 #               f_mat = min(f.mat, len(materialNames)-1)
                 if faceuv:
@@ -722,7 +722,7 @@
             # Write edges.
             if EXPORT_EDGES:
                 for ed in edges:
-                    if ed.loose:
+                    if ed.is_loose:
                         file.write('f %d %d\n' % (ed.vertices[0] + totverts, ed.vertices[1] + totverts))
 
             # Make the indicies global rather then per mesh

Modified: trunk/blender/release/scripts/io/export_ply.py
===================================================================
--- trunk/blender/release/scripts/io/export_ply.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/io/export_ply.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -156,7 +156,7 @@
     for i, f in enumerate(mesh.faces):
 
 
-        smooth = f.smooth
+        smooth = f.use_smooth
         if not smooth:
             normal = tuple(f.normal)
             normal_key = rvec3d(normal)

Modified: trunk/blender/release/scripts/io/export_x3d.py
===================================================================
--- trunk/blender/release/scripts/io/export_x3d.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/io/export_x3d.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -461,7 +461,7 @@
         self.writeIndented("<Shape>\n",1)
         maters=mesh.materials
         hasImageTexture=0
-        issmooth=0
+        is_smooth = False
 
         if len(maters) > 0 or mesh.active_uv_texture:
         # if len(maters) > 0 or mesh.faceUV:
@@ -516,10 +516,10 @@
                 self.file.write("solid=\"true\" ")
 
             for face in mesh.faces:
-                if face.smooth:
-                     issmooth=1
-                     break
-            if issmooth==1:
+                if face.use_smooth:
+                    is_smooth = True
+                    break
+            if is_smooth == True:
                 creaseAngle=(mesh.autosmooth_angle)*(math.pi/180.0)
                 # creaseAngle=(mesh.degr)*(math.pi/180.0)
                 self.file.write("creaseAngle=\"%s\" " % (round(creaseAngle,self.cp)))

Modified: trunk/blender/release/scripts/io/import_scene_obj.py
===================================================================
--- trunk/blender/release/scripts/io/import_scene_obj.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/io/import_scene_obj.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -726,7 +726,7 @@
 
 
                 if context_smooth_group:
-                    blender_face.smooth= True
+                    blender_face.use_smooth = True
 
                 if context_material:
                     if context_material_old is not context_material:
@@ -792,7 +792,7 @@
 # 		for fgon_edge in fgon_edges.keys():
 # 			for ed in me.edges:
 # 				if edges_match(fgon_edge, ed.vertices):
-# 					ed.fgon = True
+# 					ed.is_fgon = True
 
 # 	if CREATE_FGONS and fgon_edges:
 # 		FGON= Mesh.EdgeFlags.FGON
@@ -806,7 +806,7 @@
 # 		for sharp_edge in sharp_edges.keys():
 # 			for ed in me.edges:
 # 				if edges_match(sharp_edge, ed.vertices):
-# 					ed.sharp = True
+# 					ed.use_sharp = True
 
 # 	if unique_smooth_groups and sharp_edges:
 # 		SHARP= Mesh.EdgeFlags.SHARP

Modified: trunk/blender/release/scripts/keyingsets/keyingsets_utils.py
===================================================================
--- trunk/blender/release/scripts/keyingsets/keyingsets_utils.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/keyingsets/keyingsets_utils.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -96,14 +96,14 @@
 # Location 
 def RKS_GEN_location(ksi, context, ks, data):
     # get id-block and path info
-    id_block, base_path, grouping= get_transform_generators_base_info(data)
+    id_block, base_path, grouping = get_transform_generators_base_info(data)
     
     # add the property name to the base path
     path = path_add_property(base_path, "location")
     
     # add Keying Set entry for this...
     if grouping:
-        ks.paths.add(id_block, path, grouping_method='NAMED', group_name=grouping)
+        ks.paths.add(id_block, path, group_method='NAMED', group_name=grouping)
     else:
         ks.paths.add(id_block, path)
 
@@ -123,7 +123,7 @@
     
     # add Keying Set entry for this...
     if grouping:
-        ks.paths.add(id_block, path, grouping_method='NAMED', group_name=grouping)
+        ks.paths.add(id_block, path, group_method='NAMED', group_name=grouping)
     else:
         ks.paths.add(id_block, path)
 
@@ -137,7 +137,7 @@
     
     # add Keying Set entry for this...
     if grouping:
-        ks.paths.add(id_block, path, grouping_method='NAMED', group_name=grouping)
+        ks.paths.add(id_block, path, group_method='NAMED', group_name=grouping)
     else:
         ks.paths.add(id_block, path)
 
@@ -147,15 +147,11 @@
 classes = []
 
 def register():
-    register = bpy.types.register
-    for cls in classes:
-        register(cls)
+    pass
 
 
 def unregister():
-    unregister = bpy.types.unregister
-    for cls in classes:
-        unregister(cls)
+    pass
 
 if __name__ == "__main__":
     register()

Modified: trunk/blender/release/scripts/modules/bpy_types.py
===================================================================
--- trunk/blender/release/scripts/modules/bpy_types.py	2010-08-18 04:15:14 UTC (rev 31436)
+++ trunk/blender/release/scripts/modules/bpy_types.py	2010-08-18 07:14:10 UTC (rev 31437)
@@ -52,7 +52,7 @@
 
         # See: readblenentry.c, IDTYPE_FLAGS_ISLINKABLE, we could make this an attribute in rna.
         attr_links = "actions", "armatures", "brushes", "cameras", \
-                "curves", "gpencil", "groups", "images", \

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list