Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
8f5fbaef
Unverified
Commit
8f5fbaef
authored
Jun 19, 2020
by
Rémi Verschelde
Committed by
GitHub
Jun 19, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #39657 from Sl3dge78/20467
The "Anim imported" warning gets displayed properly when working on imported anims.
parents
73cbe3d9
95cd74fc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
2 deletions
+3
-2
editor_scene_importer_gltf.cpp
editor/import/editor_scene_importer_gltf.cpp
+1
-0
resource_importer_scene.cpp
editor/import/resource_importer_scene.cpp
+2
-2
No files found.
editor/import/editor_scene_importer_gltf.cpp
View file @
8f5fbaef
...
...
@@ -2877,6 +2877,7 @@ void EditorSceneImporterGLTF::_import_animation(GLTFState &state, AnimationPlaye
int
track_idx
=
animation
->
get_track_count
();
animation
->
add_track
(
Animation
::
TYPE_TRANSFORM
);
animation
->
track_set_path
(
track_idx
,
node_path
);
animation
->
track_set_imported
(
track_idx
,
true
);
//first determine animation length
const
float
increment
=
1.0
/
float
(
bake_fps
);
...
...
editor/import/resource_importer_scene.cpp
View file @
8f5fbaef
...
...
@@ -943,9 +943,9 @@ void ResourceImporterScene::_make_external_resources(Node *p_node, const String
ERR_CONTINUE
(
anim
.
is_null
());
if
(
!
p_animations
.
has
(
anim
))
{
//
mark what comes from the file first, this helps eventually keep user data
//
We are making external files so they are modifiable
for
(
int
i
=
0
;
i
<
anim
->
get_track_count
();
i
++
)
{
anim
->
track_set_imported
(
i
,
tru
e
);
anim
->
track_set_imported
(
i
,
fals
e
);
}
String
ext_name
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment