Browse Source

add "docsURL" filter to assignFieldsFrom to prevent it from triggering opening web pages when inheriting values

AzaezelX 2 years ago
parent
commit
1b33b01eb1

+ 1 - 0
Engine/source/T3D/fx/particle.cpp

@@ -147,6 +147,7 @@ FRangeValidator spinRandFValidator(-1000.f, 1000.f);
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 void ParticleData::initPersistFields()
 void ParticleData::initPersistFields()
 {
 {
+   docsURL;
    addFieldV( "dragCoefficient", TYPEID< F32 >(), Offset(dragCoefficient, ParticleData), &dragCoefFValidator,
    addFieldV( "dragCoefficient", TYPEID< F32 >(), Offset(dragCoefficient, ParticleData), &dragCoefFValidator,
       "Particle physics drag amount." );
       "Particle physics drag amount." );
    addField( "windCoefficient", TYPEID< F32 >(), Offset(windCoefficient, ParticleData),
    addField( "windCoefficient", TYPEID< F32 >(), Offset(windCoefficient, ParticleData),

+ 1 - 0
Engine/source/T3D/fx/particleEmitter.cpp

@@ -207,6 +207,7 @@ FRangeValidator phiFValidator(0.f, 360.f);
 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------
 void ParticleEmitterData::initPersistFields()
 void ParticleEmitterData::initPersistFields()
 {
 {
+   docsURL;
    addGroup( "ParticleEmitterData" );
    addGroup( "ParticleEmitterData" );
 
 
       addFieldV("ejectionPeriodMS", TYPEID< S32 >(), Offset(ejectionPeriodMS,   ParticleEmitterData), &ejectPeriodIValidator,
       addFieldV("ejectionPeriodMS", TYPEID< S32 >(), Offset(ejectionPeriodMS,   ParticleEmitterData), &ejectPeriodIValidator,

+ 1 - 0
Engine/source/T3D/item.cpp

@@ -137,6 +137,7 @@ EndImplementEnumType;
 
 
 void ItemData::initPersistFields()
 void ItemData::initPersistFields()
 {
 {
+   docsURL;
    Parent::initPersistFields();
    Parent::initPersistFields();
    addGroup("Physics");
    addGroup("Physics");
       addField("friction",          TypeF32,       Offset(friction,           ItemData), "A floating-point value specifying how much velocity is lost to impact and sliding friction.");
       addField("friction",          TypeF32,       Offset(friction,           ItemData), "A floating-point value specifying how much velocity is lost to impact and sliding friction.");

+ 1 - 0
Engine/source/T3D/player.cpp

@@ -704,6 +704,7 @@ bool PlayerData::isJumpAction(U32 action)
 
 
 void PlayerData::initPersistFields()
 void PlayerData::initPersistFields()
 {
 {
+   docsURL;
    Parent::initPersistFields();
    Parent::initPersistFields();
 
 
    addField( "pickupRadius", TypeF32, Offset(pickupRadius, PlayerData),
    addField( "pickupRadius", TypeF32, Offset(pickupRadius, PlayerData),

+ 1 - 0
Engine/source/T3D/shapeBase.cpp

@@ -534,6 +534,7 @@ bool ShapeBaseData::_setMass( void* object, const char* index, const char* data
 
 
 void ShapeBaseData::initPersistFields()
 void ShapeBaseData::initPersistFields()
 {
 {
+   docsURL;
    addGroup( "Shapes" );
    addGroup( "Shapes" );
       INITPERSISTFIELD_SHAPEASSET(Shape, ShapeBaseData, "The source shape asset.");
       INITPERSISTFIELD_SHAPEASSET(Shape, ShapeBaseData, "The source shape asset.");
       addField("computeCRC", TypeBool, Offset(computeCRC, ShapeBaseData),
       addField("computeCRC", TypeBool, Offset(computeCRC, ShapeBaseData),

+ 1 - 0
Engine/source/T3D/trigger.cpp

@@ -98,6 +98,7 @@ bool TriggerData::onAdd()
 
 
 void TriggerData::initPersistFields()
 void TriggerData::initPersistFields()
 {
 {
+   docsURL;
    addGroup("Callbacks");
    addGroup("Callbacks");
 
 
       addField( "tickPeriodMS",  TypeS32,    Offset( tickPeriodMS, TriggerData ),
       addField( "tickPeriodMS",  TypeS32,    Offset( tickPeriodMS, TriggerData ),

+ 1 - 0
Engine/source/T3D/turret/aiTurretShape.cpp

@@ -124,6 +124,7 @@ AITurretShapeData::AITurretShapeData()
 
 
 void AITurretShapeData::initPersistFields()
 void AITurretShapeData::initPersistFields()
 {
 {
+   docsURL;
    Parent::initPersistFields();
    Parent::initPersistFields();
    addGroup("AI Steering");
    addGroup("AI Steering");
       addField("maxScanHeading",       TypeF32,       Offset(maxScanHeading,        AITurretShapeData),
       addField("maxScanHeading",       TypeF32,       Offset(maxScanHeading,        AITurretShapeData),

+ 1 - 0
Engine/source/T3D/turret/turretShape.cpp

@@ -131,6 +131,7 @@ TurretShapeData::TurretShapeData()
 
 
 void TurretShapeData::initPersistFields()
 void TurretShapeData::initPersistFields()
 {
 {
+   docsURL;
    Parent::initPersistFields();
    Parent::initPersistFields();
    addGroup("Steering");
    addGroup("Steering");
       addField("zRotOnly",       TypeBool,         Offset(zRotOnly,       TurretShapeData),
       addField("zRotOnly",       TypeBool,         Offset(zRotOnly,       TurretShapeData),

+ 1 - 0
Engine/source/afx/ce/afxParticleEmitter.cpp

@@ -70,6 +70,7 @@ afxParticleEmitterData::afxParticleEmitterData(const afxParticleEmitterData& oth
 
 
 void afxParticleEmitterData::initPersistFields()
 void afxParticleEmitterData::initPersistFields()
 {
 {
+   docsURL;
   addField("fadeVelocity",      TypeBool,    Offset(fade_velocity, afxParticleEmitterData),
   addField("fadeVelocity",      TypeBool,    Offset(fade_velocity, afxParticleEmitterData),
     "If true, the initial velocity of emitted particles is multiplied by the fade amount "
     "If true, the initial velocity of emitted particles is multiplied by the fade amount "
     "of the containing effect wrapper. As the effect fades-in and out, so does the "
     "of the containing effect wrapper. As the effect fades-in and out, so does the "

+ 1 - 0
Engine/source/console/consoleObject.cpp

@@ -681,6 +681,7 @@ bool ConsoleObject::removeField(const char* in_pFieldname)
 //--------------------------------------
 //--------------------------------------
 void ConsoleObject::initPersistFields()
 void ConsoleObject::initPersistFields()
 {
 {
+   docsURL;
 }
 }
 
 
 //--------------------------------------
 //--------------------------------------

+ 4 - 0
Engine/source/console/simObject.cpp

@@ -152,6 +152,7 @@ bool SimObject::processArguments(S32 argc, ConsoleValue *argv)
 
 
 void SimObject::initPersistFields()
 void SimObject::initPersistFields()
 {
 {
+   docsURL;
    addGroup( "Ungrouped" );
    addGroup( "Ungrouped" );
 
 
       addProtectedField( "name", TypeName, Offset(mObjectName, SimObject), &setProtectedName, &defaultProtectedGetFn,
       addProtectedField( "name", TypeName, Offset(mObjectName, SimObject), &setProtectedName, &defaultProtectedGetFn,
@@ -913,6 +914,9 @@ void SimObject::assignFieldsFrom(SimObject *parent)
       {
       {
          const AbstractClassRep::Field* f = &list[i];
          const AbstractClassRep::Field* f = &list[i];
 
 
+         if (f->pFieldname == StringTable->insert("docsURL"))
+            continue;
+
          // Skip the special field types.
          // Skip the special field types.
          if ( f->type >= AbstractClassRep::ARCFirstCustomField )
          if ( f->type >= AbstractClassRep::ARCFirstCustomField )
             continue;
             continue;

+ 1 - 0
Engine/source/gfx/sim/gfxStateBlockData.cpp

@@ -65,6 +65,7 @@ GFXStateBlockData::GFXStateBlockData()
 
 
 void GFXStateBlockData::initPersistFields()
 void GFXStateBlockData::initPersistFields()
 {
 {
+   docsURL;
    addGroup( "Alpha Blending" );
    addGroup( "Alpha Blending" );
 
 
       addField( "blendDefined", TypeBool, Offset(mState.blendDefined, GFXStateBlockData),
       addField( "blendDefined", TypeBool, Offset(mState.blendDefined, GFXStateBlockData),

+ 1 - 0
Engine/source/gui/core/guiTypes.cpp

@@ -350,6 +350,7 @@ GuiControlProfile::~GuiControlProfile()
 
 
 void GuiControlProfile::initPersistFields()
 void GuiControlProfile::initPersistFields()
 {
 {
+   docsURL;
    addGroup( "Behavior" );
    addGroup( "Behavior" );
    
    
       addField( "tab",           TypeBool,       Offset(mTabable, GuiControlProfile));
       addField( "tab",           TypeBool,       Offset(mTabable, GuiControlProfile));

+ 1 - 0
Engine/source/materials/shaderData.cpp

@@ -71,6 +71,7 @@ ShaderData::ShaderData()
 
 
 void ShaderData::initPersistFields()
 void ShaderData::initPersistFields()
 {
 {
+   docsURL;
    addField("DXVertexShaderFile",   TypeStringFilename,  Offset(mDXVertexShaderName,   ShaderData),
    addField("DXVertexShaderFile",   TypeStringFilename,  Offset(mDXVertexShaderName,   ShaderData),
 	   "@brief %Path to the DirectX vertex shader file to use for this ShaderData.\n\n"
 	   "@brief %Path to the DirectX vertex shader file to use for this ShaderData.\n\n"
 	   "It must contain only one program and no pixel shader, just the vertex shader."
 	   "It must contain only one program and no pixel shader, just the vertex shader."

+ 1 - 0
Engine/source/sfx/sfxDescription.cpp

@@ -213,6 +213,7 @@ SFXDescription::SFXDescription(const SFXDescription& other, bool temp_clone)
 
 
 void SFXDescription::initPersistFields()
 void SFXDescription::initPersistFields()
 {
 {
+   docsURL;
    addGroup( "Playback" );
    addGroup( "Playback" );
    
    
       addField( "sourceGroup",         TypeSFXSourceName, Offset( mSourceGroup, SFXDescription ),
       addField( "sourceGroup",         TypeSFXSourceName, Offset( mSourceGroup, SFXDescription ),