[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39538] branches/soc-2011-pepper/source/ blender/collada: Export only objects on visible layers.

[Nathan Letwory]

Revision: 39538
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39538
Author:   jesterking
Date:     2011-08-18 22:56:41 +0000 (Thu, 18 Aug 2011)
Log Message:
-----------
Export only objects on visible layers. This ensures we can hide for instance bone shapes.

Modified Paths:
--------------
    branches/soc-2011-pepper/source/blender/collada/DocumentExporter.cpp
    branches/soc-2011-pepper/source/blender/collada/GeometryExporter.h

Modified: branches/soc-2011-pepper/source/blender/collada/DocumentExporter.cpp
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/DocumentExporter.cpp	2011-08-18 21:20:12 UTC (rev 39537)
+++ branches/soc-2011-pepper/source/blender/collada/DocumentExporter.cpp	2011-08-18 22:56:41 UTC (rev 39538)
@@ -195,6 +195,7 @@
 			Object *ob = base->object;
 
 			if (!ob->parent) {
+				if(sce->lay & ob->lay) {
 				switch(ob->type) {
 				case OB_MESH:
 				case OB_CAMERA:
@@ -208,6 +209,7 @@
 					writeNodes(ob, sce);
 					break;
 				}
+				}
 			}
 
 			base= base->next;

Modified: branches/soc-2011-pepper/source/blender/collada/GeometryExporter.h
===================================================================
--- branches/soc-2011-pepper/source/blender/collada/GeometryExporter.h	2011-08-18 21:20:12 UTC (rev 39537)
+++ branches/soc-2011-pepper/source/blender/collada/GeometryExporter.h	2011-08-18 22:56:41 UTC (rev 39538)
@@ -110,7 +110,8 @@
 			Object *ob = base->object;
 			
 			if (ob->type == OB_MESH && ob->data
-				&& !(export_selected && !(ob->flag && SELECT))) {
+				&& !(export_selected && !(ob->flag && SELECT))
+				&& ((sce->lay & ob->lay)!=0)) {
 				f(ob);
 			}
 			base= base->next;