projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
041871c
eefdb9c
)
Merge "[Tizen] Let we can use emissiveFactor without Texture" into tizen_7.0
author
Eunki Hong
<eunkiki.hong@samsung.com>
Sat, 18 Mar 2023 08:43:35 +0000
(08:43 +0000)
committer
Gerrit Code Review
<gerrit@review>
Sat, 18 Mar 2023 08:43:35 +0000
(08:43 +0000)
1
2
dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
patch
|
diff1
|
diff2
|
blob
|
history
dali-scene3d/public-api/loader/node-definition.cpp
patch
|
diff1
|
diff2
|
blob
|
history
dali-scene3d/public-api/loader/shader-definition-factory.cpp
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
dali-scene3d/internal/graphics/shaders/default-physically-based-shader.frag
Simple merge
diff --cc
dali-scene3d/public-api/loader/node-definition.cpp
Simple merge
diff --cc
dali-scene3d/public-api/loader/shader-definition-factory.cpp
Simple merge
projects / platform / core / uifw / dali-toolkit.git / commitdiff