projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5cc1971
7f1fe52
)
Merge "Allow duplicated name and use Actor ID as a unique key to define animation...
author
Adeel Kazmi
<adeel.kazmi@samsung.com>
Fri, 16 Dec 2022 19:11:19 +0000
(19:11 +0000)
committer
Gerrit Code Review
<gerrit@review>
Fri, 16 Dec 2022 19:11:19 +0000
(19:11 +0000)
1
2
automated-tests/src/dali-scene3d/utc-Dali-Gltf2Loader.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-scene3d/public-api/loader/gltf2-loader.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-scene3d/public-api/loader/node-definition.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
automated-tests/src/dali-scene3d/utc-Dali-Gltf2Loader.cpp
Simple merge
diff --cc
dali-scene3d/public-api/loader/gltf2-loader.cpp
Simple merge
diff --cc
dali-scene3d/public-api/loader/node-definition.cpp
Simple merge