[Bf-extensions-cvs] [d79e7b2] fbx_io_development: Rename use_custom_properties --> use_custom_props
Campbell Barton
noreply at git.blender.org
Wed Jul 30 10:36:34 CEST 2014
Commit: d79e7b24e4ab5464918745319c8e83e99584de54
Author: Campbell Barton
Date: Wed Jul 30 18:35:05 2014 +1000
Branches: fbx_io_development
https://developer.blender.org/rBAd79e7b24e4ab5464918745319c8e83e99584de54
Rename use_custom_properties --> use_custom_props
also remove `import_` prefix,
===================================================================
M io_scene_fbx/__init__.py
M io_scene_fbx/export_fbx_bin.py
M io_scene_fbx/fbx_utils.py
M io_scene_fbx/import_fbx.py
===================================================================
diff --git a/io_scene_fbx/__init__.py b/io_scene_fbx/__init__.py
index b359f11..3aee56d 100644
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@ -121,14 +121,14 @@ class ImportFBX(bpy.types.Operator, ImportHelper):
options={'HIDDEN'}
)
- use_custom_properties = BoolProperty(
+ use_custom_props = BoolProperty(
name="Import user properties",
description="Import user properties as custom properties",
default=True,
options={'HIDDEN'}
)
-
- import_enum_properties_as_string = BoolProperty(
+
+ use_custom_props_enum_as_string = BoolProperty(
name="Import enum properties as string",
description="Store enumeration values as string",
default=True,
@@ -149,10 +149,10 @@ class ImportFBX(bpy.types.Operator, ImportHelper):
#layout.prop(self, "use_alpha_decals")
layout.prop(self, "decal_offset")
- layout.prop(self, "use_custom_properties")
+ layout.prop(self, "use_custom_props")
sub = layout.row()
- sub.enabled = self.use_custom_properties
- sub.prop(self, "import_enum_properties_as_string")
+ sub.enabled = self.use_custom_props
+ sub.prop(self, "use_custom_props_enum_as_string")
def execute(self, context):
keywords = self.as_keywords(ignore=("filter_glob", "directory"))
@@ -266,7 +266,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,
@@ -382,7 +382,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 b9daf34..ebee05b 100644
--- a/io_scene_fbx/export_fbx_bin.py
+++ b/io_scene_fbx/export_fbx_bin.py
@@ -604,7 +604,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)
@@ -680,7 +680,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")
@@ -831,7 +831,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)
@@ -1233,7 +1233,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)
@@ -1312,7 +1312,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)
@@ -1381,7 +1381,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.
@@ -1484,7 +1484,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
@@ -2585,7 +2585,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
):
@@ -2624,7 +2624,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
@@ -2695,7 +2695,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 2d2805c..a889796 100644
--- a/io_scene_fbx/fbx_utils.py
+++ b/io_scene_fbx/fbx_utils.py
@@ -1071,7 +1071,7 @@ FBXExportSettings = namedtuple("FBXExportSettings", (
"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:
@@ -1094,5 +1094,5 @@ FBXImportSettings = namedtuple("FBXImportSettings", (
"report", "to_axes", "global_matrix", "global_scale",
"use_cycles", "use_image_search",
"use_alpha_decals", "decal_offset",
- "use_custom_properties", "import_enum_properties_as_string"
+ "use_custom_props", "use_custom_props_enum_as_string"
))
diff --git a/io_scene_fbx/import_fbx.py b/io_scene_fbx/import_fbx.py
index 6dfc062..a5c3298 100644
--- a/io_scene_fbx/import_fbx.py
+++ b/io_scene_fbx/import_fbx.py
@@ -323,7 +323,7 @@ def blen_read_custom_properties(fbx_obj, blen_obj, settings):
elif prop_type in [b'Enum', b'enum']:
assert(fbx_prop.props_type[4:6] == bytes((data_types.INT32, data_types.STRING)))
val = fbx_prop.props[4]
- if settings.import_enum_properties_as_string:
+ if settings.use_custom_props_enum_as_string:
enum_items = fbx_prop.props[5].decode('utf-8').split('~')
assert(val >= 0 and val < len(enum_items))
blen_obj[prop_name] = enum_items[val]
@@ -456,7 +456,7 @@ def blen_read_object(fbx_tmpl, fbx_obj, object_data, settings):
object_tdata_cache[obj] = transform_data
obj.matrix_basis = blen_read_object_transform_do(transform_data)
- if settings.use_custom_properties:
+ if settings.use_custom_props:
blen_read_custom_properties(fbx_obj, obj, settings)
return obj
@@ -1194,7 +1194,7 @@ def blen_read_geom(fbx_tmpl, fbx_obj, settings):
for p in mesh.polygons:
p.use_smooth = True
- if settings.use_custom_properties:
+ if settings.use_custom_props:
blen_read_custom_properties(fbx_obj, mesh, settings)
return mesh
@@ -1289,7 +1289,7 @@ def blen_read_material(fbx_tmpl, fbx_obj, cycles_material_wrap_map, settings):
ma.raytrace_mirror.reflect_factor = ma_refl_factor
ma.mirror_color = ma_refl_color
- if settings.use_custom_properties:
+ if settings.use_custom_props:
blen_read_custom_properties(fbx_obj, ma, settings)
return ma
@@ -1326,7 +1326,7 @@ def blen_read_texture(fbx_tmpl, fbx_obj, basedir, image_cache,
# name can be ../a/b/c
image.name = os.path.basename(elem_name_utf8)
- if settings.use_custom_properties:
+ if settings.use_custom_props:
blen_read_custom_properties(fbx_obj, image, settings)
return image
@@ -1420,8 +1420,8 @@ def load(operator, context, filepath="",
use_image_search=False,
use_alpha_decals=False,
decal_offset=0.0,
- use_custom_properties=True,
- import_enum_properties_as_string=True):
+ use_custom_props=True,
+ use_custom_props_enum_as_string=True):
global fbx_elem_nil
fbx_elem_nil = FBXElem('', (), (), ())
@@ -1515,8 +1515,8 @@ def load(operator, context, filepath="",
operator.report, (axis_up, axis_forward), global_matrix, global_scale,
use_cycles, use_image_search,
use_alpha_decals, decal_offset,
- use_custom_properties, import_enum_properties_as_string
- )
+ use_custom_props, use_custom_props_enum_as_string,
+ )
#### And now, the "real" data.
More information about the Bf-extensions-cvs
mailing list