[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2355] trunk/py/scripts/addons/ io_scene_3ds/import_3ds.py: fix [#28405] Importing certain 3DS files takes a very long time

[Campbell Barton]

Revision: 2355
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2355
Author:   campbellbarton
Date:     2011-09-25 03:20:48 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
fix [#28405] Importing certain 3DS files takes a very long time

Modified Paths:
--------------
    trunk/py/scripts/addons/io_scene_3ds/import_3ds.py

Modified: trunk/py/scripts/addons/io_scene_3ds/import_3ds.py
===================================================================
--- trunk/py/scripts/addons/io_scene_3ds/import_3ds.py	2011-09-24 22:25:44 UTC (rev 2354)
+++ trunk/py/scripts/addons/io_scene_3ds/import_3ds.py	2011-09-25 03:20:48 UTC (rev 2355)
@@ -755,12 +755,16 @@
         putContextMesh(contextMesh_vertls, contextMesh_facels, contextMeshMaterials)
 
     # Assign parents to objects
+    # check _if_ we need to assign first because doing so recalcs the depsgraph
     for ind, ob in enumerate(object_list):
         parent = object_parent[ind]
         if parent == ROOT_OBJECT:
-            ob.parent = None
+            if ob.parent is not None:
+                ob.parent = None
         else:
-            ob.parent = object_list[parent]
+            if ob.parent != object_list[parent]:
+                ob.parent = object_list[parent]
+
             # pivot_list[ind] += pivot_list[parent]  # XXX, not sure this is correct, should parent space matrix be applied before combining?
     # fix pivots
     for ind, ob in enumerate(object_list):