[cgma-dev] r4668 - cgm/branches/merge-cubit12/geom
jiangtao_ma at yahoo.com
jiangtao_ma at yahoo.com
Mon Mar 28 13:33:59 CDT 2011
Author: janehu
Date: 2011-03-28 13:33:59 -0500 (Mon, 28 Mar 2011)
New Revision: 4668
Modified:
cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp
Log:
in subtract function, subtract and finish_sm_op can independently return success or failure, so set them differently.
Modified: cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp
===================================================================
--- cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-28 18:31:31 UTC (rev 4667)
+++ cgm/branches/merge-cubit12/geom/GeometryModifyTool.cpp 2011-03-28 18:33:59 UTC (rev 4668)
@@ -6370,7 +6370,7 @@
if( CubitUndo::get_undo_enabled() && result == CUBIT_FAILURE )
CubitUndo::remove_last_undo();
- result = finish_sm_op(tem_bodies, new_sms, new_bodies);
+ CubitStatus result2 = finish_sm_op(tem_bodies, new_sms, new_bodies);
if( CubitUndo::get_undo_enabled() )
{
@@ -6380,7 +6380,7 @@
CubitUndo::remove_last_undo();
}
- if ( result == CUBIT_FAILURE )
+ if ( result == CUBIT_FAILURE || result2 == CUBIT_FAILURE)
{
PRINT_ERROR("Subtract FAILED\n" );
return CUBIT_FAILURE;
More information about the cgma-dev
mailing list