[cig-commits] commit: Add in backwards compatibility so Cylinder takes alongAxis or perpendicularAxis

Mercurial hg at geodynamics.org
Wed Jan 6 06:00:35 PST 2010


changeset:   512:a68f75fb9cd2
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Wed Jan 06 05:58:25 2010 -0800
files:       Shape/src/Cylinder.c
description:
Add in backwards compatibility so Cylinder takes alongAxis or perpendicularAxis


diff -r ca70ab78f990 -r a68f75fb9cd2 Shape/src/Cylinder.c
--- a/Shape/src/Cylinder.c	Tue Dec 22 22:55:01 2009 -0800
+++ b/Shape/src/Cylinder.c	Wed Jan 06 05:58:25 2010 -0800
@@ -223,7 +223,8 @@ void _Cylinder_Construct( void* cylinder
 	end[ J_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "endY", BIG );
 	end[ K_AXIS ] = Stg_ComponentFactory_GetDouble( cf, self->name, "endZ", BIG );
 
-	perpendicularAxisName = Stg_ComponentFactory_GetString( cf, self->name, "alongAxis", "x" );
+	perpendicularAxisName = Stg_ComponentFactory_GetString( cf, self->name, "perpendicularAxis", "x" );
+	perpendicularAxisName = Stg_ComponentFactory_GetString( cf, self->name, "alongAxis", perpendicularAxisName );
 	switch ( perpendicularAxisName[0] ) {
 		case 'x': case 'X': case 'i': case 'I': case '0':
 			alongAxis = I_AXIS; break;



More information about the CIG-COMMITS mailing list