[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [4704] trunk/py/scripts/addons/ system_demo_mode: use directory selection for demo-mode.

Campbell Barton ideasman42 at gmail.com
Wed Aug 28 02:59:43 CEST 2013


Revision: 4704
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=4704
Author:   campbellbarton
Date:     2013-08-28 00:59:42 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
use directory selection for demo-mode.

Modified Paths:
--------------
    trunk/py/scripts/addons/system_demo_mode/__init__.py
    trunk/py/scripts/addons/system_demo_mode/config.py

Modified: trunk/py/scripts/addons/system_demo_mode/__init__.py
===================================================================
--- trunk/py/scripts/addons/system_demo_mode/__init__.py	2013-08-26 18:57:02 UTC (rev 4703)
+++ trunk/py/scripts/addons/system_demo_mode/__init__.py	2013-08-28 00:59:42 UTC (rev 4704)
@@ -56,11 +56,11 @@
     # to the class instance from the operator settings before calling.
 
     # these are used to create the file list.
-    filepath = StringProperty(
-            name="File Path",
-            description="Filepath used for importing the file",
+    directory = StringProperty(
+            name="Search Path",
+            description="directory used for importing the file",
             maxlen=1024,
-            subtype='FILE_PATH',
+            subtype='DIR_PATH',
             )
     random_order = BoolProperty(
             name="Random Order",
@@ -139,8 +139,8 @@
     def execute(self, context):
         from . import config
 
-        keywords = self.as_keywords(ignore=("filepath", "random_order", "run", "exit"))
-        cfg_str, dirpath = config.as_string(self.filepath,
+        keywords = self.as_keywords(ignore=("directory", "random_order", "run", "exit"))
+        cfg_str, dirpath = config.as_string(self.directory,
                                             self.random_order,
                                             self.exit,
                                             **keywords)

Modified: trunk/py/scripts/addons/system_demo_mode/config.py
===================================================================
--- trunk/py/scripts/addons/system_demo_mode/config.py	2013-08-26 18:57:02 UTC (rev 4703)
+++ trunk/py/scripts/addons/system_demo_mode/config.py	2013-08-28 00:59:42 UTC (rev 4704)
@@ -15,11 +15,6 @@
 
 
 def generate(dirpath, random_order, **kwargs):
-
-    # in case file is selected!
-    if not os.path.exists(dirpath) or not os.path.isdir(dirpath):
-        dirpath = os.path.dirname(dirpath)
-
     files = list(blend_list(dirpath))
     if random_order:
         import random



More information about the Bf-extensions-cvs mailing list