[Bf-extensions-cvs] [7425a27] master: FBX: abbreviate custom_properties -> custom_props

Campbell Barton noreply at git.blender.org
Wed Jul 30 11:37:54 CEST 2014


Commit: 7425a27c6b3097754b91c9229dc5c43dcf9f1c4f
Author: Campbell Barton
Date:   Wed Jul 30 19:36:23 2014 +1000
Branches: master
https://developer.blender.org/rBA7425a27c6b3097754b91c9229dc5c43dcf9f1c4f

FBX: abbreviate custom_properties -> custom_props

===================================================================

M	io_scene_fbx/__init__.py
M	io_scene_fbx/export_fbx_bin.py
M	io_scene_fbx/fbx_utils.py

===================================================================

diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index 858e212..06bad89 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -249,7 +249,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
             default=False,
             )
     # 7.4 only
-    use_custom_properties = BoolProperty(
+    use_custom_props = BoolProperty(
             name="Custom Properties",
             description="Export custom properties",
             default=False,
@@ -365,7 +365,7 @@ class ExportFBX(bpy.types.Operator, ExportHelper):
         layout.prop(self, "use_tspace")
         layout.prop(self, "use_armature_deform_only")
         if is_74bin:
-            layout.prop(self, "use_custom_properties")
+            layout.prop(self, "use_custom_props")
             layout.prop(self, "bake_anim")
             col = layout.column()
             col.enabled = self.bake_anim
diff --git a/io_scene_fbx/export_fbx_bin.py b/io_scene_fbx/export_fbx_bin.py
index de38f0a..22cd25c 100644
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@ -598,7 +598,7 @@ def fbx_data_lamp_elements(root, lamp, scene_data):
     elem_props_template_finalize(tmpl, props)
 
     # Custom properties.
-    if scene_data.settings.use_custom_properties:
+    if scene_data.settings.use_custom_props:
         fbx_data_element_custom_properties(props, lamp)
 
 
@@ -674,7 +674,7 @@ def fbx_data_camera_elements(root, cam_obj, scene_data):
     elem_props_template_finalize(tmpl, props)
 
     # Custom properties.
-    if scene_data.settings.use_custom_properties:
+    if scene_data.settings.use_custom_props:
         fbx_data_element_custom_properties(props, cam_data)
 
     elem_data_single_string(cam, b"TypeFlags", b"Camera")
@@ -825,7 +825,7 @@ def fbx_data_mesh_elements(root, me_obj, scene_data, done_meshes):
     props = elem_properties(geom)
 
     # Custom properties.
-    if scene_data.settings.use_custom_properties:
+    if scene_data.settings.use_custom_props:
         fbx_data_element_custom_properties(props, me)
 
     elem_data_single_int32(geom, b"GeometryVersion", FBX_GEOMETRY_VERSION)
@@ -1227,7 +1227,7 @@ def fbx_data_material_elements(root, mat, scene_data):
     elem_props_template_finalize(tmpl, props)
 
     # Custom properties.
-    if scene_data.settings.use_custom_properties:
+    if scene_data.settings.use_custom_props:
         fbx_data_element_custom_properties(props, mat)
 
 
@@ -1306,7 +1306,7 @@ def fbx_data_texture_file_elements(root, tex, scene_data):
     elem_props_template_finalize(tmpl, props)
 
     # Custom properties.
-    if scene_data.settings.use_custom_properties:
+    if scene_data.settings.use_custom_props:
         fbx_data_element_custom_properties(props, tex.texture)
 
 
@@ -1375,7 +1375,7 @@ def fbx_data_armature_elements(root, arm_obj, scene_data):
         elem_props_template_finalize(tmpl, props)
 
         # Custom properties.
-        if scene_data.settings.use_custom_properties:
+        if scene_data.settings.use_custom_props:
             fbx_data_element_custom_properties(props, bo)
 
     # Skin deformers and BindPoses.
@@ -1478,7 +1478,7 @@ def fbx_data_object_elements(root, ob_obj, scene_data):
     elem_props_template_set(tmpl, props, "p_enum", b"InheritType", 1)  # RSrs
 
     # Custom properties.
-    if scene_data.settings.use_custom_properties:
+    if scene_data.settings.use_custom_props:
         fbx_data_element_custom_properties(props, ob_obj.bdata)
 
     # Those settings would obviously need to be edited in a complete version of the exporter, may depends on
@@ -2579,7 +2579,7 @@ def save_single(operator, scene, filepath="",
                 use_mesh_edges=True,
                 use_tspace=True,
                 embed_textures=False,
-                use_custom_properties=False,
+                use_custom_props=False,
                 bake_space_transform=False,
                 **kwargs
                 ):
@@ -2618,7 +2618,7 @@ def save_single(operator, scene, filepath="",
         context_objects, object_types, use_mesh_modifiers,
         mesh_smooth_type, use_mesh_edges, use_tspace, use_armature_deform_only,
         bake_anim, bake_anim_use_nla_strips, bake_anim_use_all_actions, bake_anim_step, bake_anim_simplify_factor,
-        False, media_settings, use_custom_properties,
+        False, media_settings, use_custom_props,
     )
 
     import bpy_extras.io_utils
@@ -2689,7 +2689,7 @@ def defaults_unity3d():
 
         "use_armature_deform_only": True,
 
-        "use_custom_properties": True,
+        "use_custom_props": True,
 
         "bake_anim": True,
         "bake_anim_simplify_factor": 1.0,
diff --git a/io_scene_fbx/fbx_utils.py b/io_scene_fbx/fbx_utils.py
index 0db26c5..c0e8b41 100644
--- a/io_scene_fbx/fbx_utils.py
+++ b/io_scene_fbx/fbx_utils.py
@@ -1071,7 +1071,7 @@ FBXSettings = namedtuple("FBXSettings", (
     "context_objects", "object_types", "use_mesh_modifiers",
     "mesh_smooth_type", "use_mesh_edges", "use_tspace", "use_armature_deform_only",
     "bake_anim", "bake_anim_use_nla_strips", "bake_anim_use_all_actions", "bake_anim_step", "bake_anim_simplify_factor",
-    "use_metadata", "media_settings", "use_custom_properties",
+    "use_metadata", "media_settings", "use_custom_props",
 ))
 
 # Helper container gathering some data we need multiple times:



More information about the Bf-extensions-cvs mailing list