OSDN Git Service
(root)
/
qtgeoviewer
/
QtGeoViewer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b90b919
)
テクスチャを解除できないことがある不具合を修正
author
qw_fuku
<fkhideaki@gmail.com>
Sat, 1 Aug 2015 06:24:22 +0000
(15:24 +0900)
committer
qw_fuku
<fkhideaki@gmail.com>
Sat, 1 Aug 2015 06:24:22 +0000
(15:24 +0900)
Src/QtGeoViewer/FormMain.cpp
patch
|
blob
|
history
diff --git
a/Src/QtGeoViewer/FormMain.cpp
b/Src/QtGeoViewer/FormMain.cpp
index
8b75750
..
83319ab
100644
(file)
--- a/
Src/QtGeoViewer/FormMain.cpp
+++ b/
Src/QtGeoViewer/FormMain.cpp
@@
-3161,10
+3161,11
@@
void FormMain::LoadCurSelMatTexture(TextureType type, QString filepath)
void FormMain::ReleaseCurSelTexture(TextureType type)
{
-
MeshBuf* mbuf = m_Scene.GetPrimaryMeshbuf
();
- if (
mbuf
== NULL)
+
GeomTextureSet* ts = m_Scene.GetSelectedTexture
();
+ if (
ts
== NULL)
return;
+ MeshBuf* mbuf = ts->GetParent();
int mat_idx = mbuf->GetSelMatIdx();
m_ContextShare.BeginDrawTop();