Merge commit '2eba151725fc6994974dd26f44b08c970c09e7b2'

Author: Shrediquette

+preproc/cam_enable_cam_calib_Callback.m

@@ -90,7 +90,9 @@ function cam_enable_cam_calib_Callback(caller,~,~)
         gui.put('cam_use_calibration',0);
         handles.calib_usecalibration.Value = 0;
         gui.custom_msgbox('error',getappdata(0,'hgui'),'Error','Calibration images and PIV images must have identical size.','modal');
-        return
+        handles.calib_usecalibration.Value = 0;
+		gui.toolsavailable(1)
+		return
     end
     view_raw=handles.calib_viewtype.Value;
     if view_raw==1