Merge remote-tracking branch 'upstream/master'

jessdtate · jessdtate · commit 9364c561889a · 2016-06-21T11:18:57.000-06:00
diff --git a/src/Modules/Fields/EditMeshBoundingBox.cc b/src/Modules/Fields/EditMeshBoundingBox.cc
@@ -200,6 +200,7 @@ void EditMeshBoundingBox::setStateDefaults()
   state->setValue(NoTranslation, true);
   state->setValue(XYZTranslation, false);
   state->setValue(RDITranslation, false);
+  state->setValue(Resetting, false);
   
   //TODO
 
diff --git a/src/Modules/Legacy/Fields/ExtractSimpleIsosurface.cc b/src/Modules/Legacy/Fields/ExtractSimpleIsosurface.cc
@@ -56,6 +56,7 @@ void ExtractSimpleIsosurfaceModule::setStateDefaults()
   setStateStringFromAlgo(Parameters::ListOfIsovalues);
   setStateIntFromAlgo(Parameters::QuantityOfIsovalues);
   get_state()->setValue(Parameters::IsovalueListString, std::string());
+  get_state()->setValue(Parameters::IsovalueChoice, std::string("Single"));
 }
 
 void ExtractSimpleIsosurfaceModule::execute()

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ void ExtractSimpleIsosurfaceModule::setStateDefaults()`
`56`	`56`	`setStateStringFromAlgo(Parameters::ListOfIsovalues);`
`57`	`57`	`setStateIntFromAlgo(Parameters::QuantityOfIsovalues);`
`58`	`58`	`get_state()->setValue(Parameters::IsovalueListString, std::string());`
	`59`	`+ get_state()->setValue(Parameters::IsovalueChoice, std::string("Single"));`
`59`	`60`	`}`
`60`	`61`
`61`	`62`	`void ExtractSimpleIsosurfaceModule::execute()`