[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39912] trunk/blender/source/blender/ collada/DocumentImporter.cpp: Remove NULL-checks, as they might cause infinite loops while reading a DAE containing unsupported data , i.e.

[Nathan Letwory]

Revision: 39912
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39912
Author:   jesterking
Date:     2011-09-04 22:14:28 +0000 (Sun, 04 Sep 2011)
Log Message:
-----------
Remove NULL-checks, as they might cause infinite loops while reading a DAE containing unsupported data, i.e. <lines> geometry.

Modified Paths:
--------------
    trunk/blender/source/blender/collada/DocumentImporter.cpp

Modified: trunk/blender/source/blender/collada/DocumentImporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/DocumentImporter.cpp	2011-09-04 18:36:27 UTC (rev 39911)
+++ trunk/blender/source/blender/collada/DocumentImporter.cpp	2011-09-04 22:14:28 UTC (rev 39912)
@@ -410,18 +410,15 @@
 		while (geom_done < geom.getCount()) {
 			ob = mesh_importer.create_mesh_object(node, geom[geom_done], false, uid_material_map,
 												  material_texture_mapping_map);
-			if ( ob != NULL )
-				++geom_done;
+			++geom_done;
 		}
 		while (camera_done < camera.getCount()) {
 			ob = create_camera_object(camera[camera_done], sce);
-			if ( ob != NULL )
-				++camera_done;
+			++camera_done;
 		}
 		while (lamp_done < lamp.getCount()) {
 			ob = create_lamp_object(lamp[lamp_done], sce);
-			if ( ob != NULL )
-				++lamp_done;
+			++lamp_done;
 		}
 		while (controller_done < controller.getCount()) {
 			COLLADAFW::InstanceGeometry *geom = (COLLADAFW::InstanceGeometry*)controller[controller_done];