[Bf-extensions-cvs] [688e99b] fbx_io_development: Merge branch 'master' into fbx_io_development

[Campbell Barton]

Commit: 688e99b2859c9b477234fbf06b428275d05138fd
Author: Campbell Barton
Date:   Wed Jul 30 19:40:07 2014 +1000
Branches: fbx_io_development
https://developer.blender.org/rBA688e99b2859c9b477234fbf06b428275d05138fd

Merge branch 'master' into fbx_io_development

Conflicts:
	io_scene_fbx/__init__.py

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



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

diff --cc io_scene_fbx/__init__.py
index 3aee56d,06bad89..fa6cb52
--- a/io_scene_fbx/__init__.py
+++ b/io_scene_fbx/__init__.py
@@@ -69,72 -70,58 +70,71 @@@ class ImportFBX(bpy.types.Operator, Imp
      filter_glob = StringProperty(default="*.fbx", options={'HIDDEN'})
  
      use_manual_orientation = BoolProperty(
-         name="Manual Orientation",
-         description="Specify orientation and scale, instead of using embedded data in FBX file",
-         default=False,
-     )
+             name="Manual Orientation",
+             description="Specify orientation and scale, instead of using embedded data in FBX file",
+             default=False,
+             )
      axis_forward = EnumProperty(
-         name="Forward",
-         items=(('X', "X Forward", ""),
-                ('Y', "Y Forward", ""),
-                ('Z', "Z Forward", ""),
-                ('-X', "-X Forward", ""),
-                ('-Y', "-Y Forward", ""),
-                ('-Z', "-Z Forward", ""),
-                ),
-         default='-Z',
-     )
+             name="Forward",
+             items=(('X', "X Forward", ""),
+                    ('Y', "Y Forward", ""),
+                    ('Z', "Z Forward", ""),
+                    ('-X', "-X Forward", ""),
+                    ('-Y', "-Y Forward", ""),
+                    ('-Z', "-Z Forward", ""),
+                    ),
+             default='-Z',
+             )
      axis_up = EnumProperty(
-         name="Up",
-         items=(('X', "X Up", ""),
-                ('Y', "Y Up", ""),
-                ('Z', "Z Up", ""),
-                ('-X', "-X Up", ""),
-                ('-Y', "-Y Up", ""),
-                ('-Z', "-Z Up", ""),
-                ),
-         default='Y',
-     )
+             name="Up",
+             items=(('X', "X Up", ""),
+                    ('Y', "Y Up", ""),
+                    ('Z', "Z Up", ""),
+                    ('-X', "-X Up", ""),
+                    ('-Y', "-Y Up", ""),
+                    ('-Z', "-Z Up", ""),
+                    ),
+             default='Y',
+             )
      global_scale = FloatProperty(
-         name="Scale",
-         min=0.001, max=1000.0,
-         default=1.0,
-     )
+             name="Scale",
+             min=0.001, max=1000.0,
+             default=1.0,
+             )
  
      use_image_search = BoolProperty(
-         name="Image Search",
-         description="Search subdirs for any associated images (Warning, may be slow)",
-         default=True,
-     )
+             name="Image Search",
+             description="Search subdirs for any associated images (Warning, may be slow)",
+             default=True,
+             )
  
      use_alpha_decals = BoolProperty(
-         name="Alpha Decals",
-         description="Treat materials with alpha as decals (no shadow casting)",
-         default=False,
-         options={'HIDDEN'}
-     )
+             name="Alpha Decals",
+             description="Treat materials with alpha as decals (no shadow casting)",
+             default=False,
+             options={'HIDDEN'}
+             )
      decal_offset = FloatProperty(
-         name="Decal Offset",
-         description="Displace geometry of alpha meshes",
-         min=0.0, max=1.0,
-         default=0.0,
-         options={'HIDDEN'}
-     )
+             name="Decal Offset",
+             description="Displace geometry of alpha meshes",
+             min=0.0, max=1.0,
+             default=0.0,
+             options={'HIDDEN'}
+             )
  
 +    use_custom_props = BoolProperty(
-         name="Import user properties",
-         description="Import user properties as custom properties",
-         default=True,
-         options={'HIDDEN'}
-     )
- 
++            name="Import user properties",
++            description="Import user properties as custom properties",
++            default=True,
++            options={'HIDDEN'},
++            )
 +    use_custom_props_enum_as_string = BoolProperty(
-         name="Import enum properties as string",
-         description="Store enumeration values as string",
-         default=True,
-         options={'HIDDEN'}
-     )
++            name="Import enum properties as string",
++            description="Store enumeration values as string",
++            default=True,
++            options={'HIDDEN'},
++            )
 +    
      def draw(self, context):
          layout = self.layout
  
@@@ -146,14 -133,9 +146,14 @@@
          sub.prop(self, "global_scale")
  
          layout.prop(self, "use_image_search")
-         #layout.prop(self, "use_alpha_decals")
+         # layout.prop(self, "use_alpha_decals")
          layout.prop(self, "decal_offset")
  
 +        layout.prop(self, "use_custom_props")
 +        sub = layout.row()
 +        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"))
          keywords["use_cycles"] = (context.scene.render.engine == 'CYCLES')