Merge branch 'master' into releaseCandidate_P

dcwhite · dcwhite · commit 6f7aff978785 · 2015-02-02T14:12:56.000-07:00
diff --git a/src/Interface/Modules/Render/ES/Registration.cc b/src/Interface/Modules/Render/ES/Registration.cc
@@ -64,7 +64,7 @@ void rendererRegisterAll(CPM_ES_ACORN_NS::Acorn& core)
   core.registerComponent<RenderColorMapGeom>();
   core.registerComponent<SRRenderState>();
   core.registerComponent<RenderList>();
-  //core.registerComponent<SpireSubPass>();
+  core.registerComponent<Core::Datatypes::GeometryObject::SpireSubPass>();
 }
 
 } // namespace Render

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ void rendererRegisterAll(CPM_ES_ACORN_NS::Acorn& core)`
`64`	`64`	`core.registerComponent<RenderColorMapGeom>();`
`65`	`65`	`core.registerComponent<SRRenderState>();`
`66`	`66`	`core.registerComponent<RenderList>();`
`67`		`- //core.registerComponent<SpireSubPass>();`
	`67`	`+ core.registerComponent<Core::Datatypes::GeometryObject::SpireSubPass>();`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`} // namespace Render`