[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4395] trunk/py/scripts/addons/ io_scene_vrml2: VRML: export vertex colors by default and fallback to material colors.

[Campbell Barton]

Revision: 4395
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4395
Author:   campbellbarton
Date:     2013-03-19 21:18:13 +0000 (Tue, 19 Mar 2013)
Log Message:
-----------
VRML: export vertex colors by default and fallback to material colors.

Modified Paths:
--------------
    trunk/py/scripts/addons/io_scene_vrml2/__init__.py
    trunk/py/scripts/addons/io_scene_vrml2/export_vrml2.py

Modified: trunk/py/scripts/addons/io_scene_vrml2/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_vrml2/__init__.py	2013-03-19 21:06:16 UTC (rev 4394)
+++ trunk/py/scripts/addons/io_scene_vrml2/__init__.py	2013-03-19 21:18:13 UTC (rev 4395)
@@ -70,9 +70,8 @@
     color_type = EnumProperty(
             name='Color',
             items=(
-            ('MATERIAL', "Material Color", ""),
-            ('VERTEX', "Vertex Color", "")),
-            default='MATERIAL',
+            ('VERTEX', "Vertex Color", ""),
+            ('MATERIAL', "Material Color", "")),
             )
     use_uv = BoolProperty(
             name="Texture/UVs",

Modified: trunk/py/scripts/addons/io_scene_vrml2/export_vrml2.py
===================================================================
--- trunk/py/scripts/addons/io_scene_vrml2/export_vrml2.py	2013-03-19 21:06:16 UTC (rev 4394)
+++ trunk/py/scripts/addons/io_scene_vrml2/export_vrml2.py	2013-03-19 21:18:13 UTC (rev 4395)
@@ -206,16 +206,16 @@
     if use_color:
         if color_type == 'VERTEX':
             if bm.loops.layers.color.active is None:
-                use_color = False
-        elif color_type == 'MATERIAL':
+                # fallback to material
+                color_type = 'MATERIAL'
+        if color_type == 'MATERIAL':
             if not me.materials:
                 use_color = False
             else:
                 material_colors = [
                         "%.2f %.2f %.2f " % (m.diffuse_color[:] if m else (1.0, 1.0, 1.0))
                         for m in me.materials]
-        else:
-            assert(0)
+        assert(color_type in {'VERTEX', 'MATERIAL'})
 
     if use_uv:
         if bm.loops.layers.uv.active is None: