diff options
author | RĂ©mi Verschelde <remi@verschelde.fr> | 2022-04-13 22:47:54 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-13 22:47:54 +0200 |
commit | 970debed93fd172776914b9482e2c110e01a1ac1 (patch) | |
tree | 0ef1e35464549a6932b6cb7f65376cbc81a7148d /doc/classes | |
parent | 8ada85ef1d7ddfa30871f002812efaec65f4a170 (diff) | |
parent | 66009318e0827f01a584aca14c6e9ec0079354d3 (diff) |
Merge pull request #60177 from reduz/animation-library-import
Import scenes as AnimationLibrary
Diffstat (limited to 'doc/classes')
-rw-r--r-- | doc/classes/EditorSceneFormatImporter.xml | 14 | ||||
-rw-r--r-- | doc/classes/EditorScenePostImportPlugin.xml | 6 |
2 files changed, 8 insertions, 12 deletions
diff --git a/doc/classes/EditorSceneFormatImporter.xml b/doc/classes/EditorSceneFormatImporter.xml index 63c1498f20..0290d7207d 100644 --- a/doc/classes/EditorSceneFormatImporter.xml +++ b/doc/classes/EditorSceneFormatImporter.xml @@ -29,16 +29,8 @@ <method name="_get_option_visibility" qualifiers="virtual const"> <return type="Variant" /> <argument index="0" name="path" type="String" /> - <argument index="1" name="option" type="String" /> - <description> - </description> - </method> - <method name="_import_animation" qualifiers="virtual"> - <return type="Animation" /> - <argument index="0" name="path" type="String" /> - <argument index="1" name="flags" type="int" /> - <argument index="2" name="options" type="Dictionary" /> - <argument index="3" name="bake_fps" type="int" /> + <argument index="1" name="for_animation" type="bool" /> + <argument index="2" name="option" type="String" /> <description> </description> </method> @@ -63,5 +55,7 @@ </constant> <constant name="IMPORT_USE_NAMED_SKIN_BINDS" value="16"> </constant> + <constant name="IMPORT_DISCARD_MESHES_AND_MATERIALS" value="32"> + </constant> </constants> </class> diff --git a/doc/classes/EditorScenePostImportPlugin.xml b/doc/classes/EditorScenePostImportPlugin.xml index de9d5e067a..0fdbd5db1e 100644 --- a/doc/classes/EditorScenePostImportPlugin.xml +++ b/doc/classes/EditorScenePostImportPlugin.xml @@ -34,7 +34,8 @@ <method name="_get_internal_option_visibility" qualifiers="virtual const"> <return type="Variant" /> <argument index="0" name="category" type="int" /> - <argument index="1" name="option" type="String" /> + <argument index="1" name="for_animation" type="bool" /> + <argument index="2" name="option" type="String" /> <description> Return true or false whether a given option should be visible. Return null to ignore. </description> @@ -42,7 +43,8 @@ <method name="_get_option_visibility" qualifiers="virtual const"> <return type="Variant" /> <argument index="0" name="path" type="String" /> - <argument index="1" name="option" type="String" /> + <argument index="1" name="for_animation" type="bool" /> + <argument index="2" name="option" type="String" /> <description> Return true or false whether a given option should be visible. Return null to ignore. </description> |