Copy changes from dev-branch into main

History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions

View File

@@ -18,6 +18,8 @@
#include "RimCheckableObject.h"
#include "cafPdmFieldScriptingCapability.h"
CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCheckableObject, "RimCheckableObject" ); // Do not use. Abstract class
//--------------------------------------------------------------------------------------------------
@@ -25,7 +27,7 @@ CAF_PDM_XML_ABSTRACT_SOURCE_INIT( RimCheckableObject, "RimCheckableObject" ); //
//--------------------------------------------------------------------------------------------------
RimCheckableObject::RimCheckableObject()
{
CAF_PDM_InitField( &m_isChecked, "IsChecked", true, "Active" );
CAF_PDM_InitScriptableField( &m_isChecked, "IsChecked", true, "Active" );
m_isChecked.uiCapability()->setUiHidden( true );
}