mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Merge branch 'dev' into modularization-prototype
Set version to 1.3.101-dev
This commit is contained in:
commit
627b3c2292
@ -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());
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
@ -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})
|
||||
|
Loading…
Reference in New Issue
Block a user