OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into modularization-prototype

Browse Source 
Set version to 1.3.101-dev
This commit is contained in:
Jacob Støren 2015-08-24 16:54:15 +02:00
commit 627b3c2292
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimGeoMechView.cpp
View File

@ -446,7 +446,7 @@ void RimGeoMechView::clampCurrentTimestep()
//--------------------------------------------------------------------------------------------------
bool RimGeoMechView::isTimeStepDependentDataVisible()
{
return this->hasUserRequestedAnimation() && this->cellResult()->hasResult();
return this->hasUserRequestedAnimation() && (this->cellResult()->hasResult() || this->propertyFilterCollection()->hasActiveFilters());
}
//--------------------------------------------------------------------------------------------------

2
ResInsightVersion.cmake
View File

@ -1,7 +1,7 @@
set(CMAKE_MAJOR_VERSION 1)
set(CMAKE_MINOR_VERSION 3)
set(CMAKE_PATCH_VERSION 100)
set(CMAKE_PATCH_VERSION 101)
set(DEV_VERSION "-dev")
set(PRODUCTVER ${CMAKE_MAJOR_VERSION},${CMAKE_MINOR_VERSION},0,${CMAKE_PATCH_VERSION})