Build fixes
This commit is contained in:
parent
624c5a7b4b
commit
f95a5823d0
2 changed files with 14 additions and 18 deletions
|
@ -1876,10 +1876,11 @@ void StopMotion::directDslrImage() {
|
|||
saveTestShot();
|
||||
else
|
||||
importImage();
|
||||
|
||||
#ifdef WITH_CANON
|
||||
if (m_canon->m_liveViewExposureOffset != 0) {
|
||||
m_canon->setShutterSpeed(m_canon->m_realShutterSpeed, false);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
@ -1918,13 +1919,16 @@ void StopMotion::takeTestShot() {
|
|||
}
|
||||
m_isTestShot = true;
|
||||
if (m_usingWebcam) {
|
||||
if (m_light->useOverlays()) {
|
||||
m_light->showOverlays();
|
||||
m_webcamOverlayTimer->start(500);
|
||||
} else {
|
||||
saveTestShot();
|
||||
}
|
||||
} else {
|
||||
if (m_light->useOverlays()) {
|
||||
m_light->showOverlays();
|
||||
m_webcamOverlayTimer->start(500);
|
||||
}
|
||||
else {
|
||||
saveTestShot();
|
||||
}
|
||||
}
|
||||
#ifdef WITH_CANON
|
||||
else {
|
||||
TApp *app = TApp::instance();
|
||||
ToonzScene *scene = app->getCurrentScene()->getScene();
|
||||
TFilePath parentDir = scene->decodeFilePath(TFilePath(m_filePath));
|
||||
|
@ -1934,11 +1938,10 @@ void StopMotion::takeTestShot() {
|
|||
TSystem::mkDir(parentDir);
|
||||
}
|
||||
m_tempFile = tempFile.getQString();
|
||||
#ifdef WITH_CANON
|
||||
m_light->showOverlays();
|
||||
m_canon->takePicture();
|
||||
#endif
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------------------------
|
||||
|
|
|
@ -1100,14 +1100,7 @@ void TStyleSelection::pasteStylesValues(bool pasteName, bool pasteColor) {
|
|||
dstType = LINKEDSTYLE;
|
||||
//---- 追加ここまで iwasawa
|
||||
|
||||
// For cleanup styles, do not duplicate the cleanup information. Just
|
||||
// paste color information.
|
||||
TCleanupStyle *cleanupStyle =
|
||||
dynamic_cast<TCleanupStyle *>(data->getStyle(i));
|
||||
if (cleanupStyle)
|
||||
palette->setStyle(styleId, cleanupStyle->getMainColor());
|
||||
else
|
||||
palette->setStyle(styleId, data->getStyle(i)->clone());
|
||||
palette->setStyle(styleId, data->getStyle(i)->clone());
|
||||
|
||||
// Process the global and original names according to the pasted style
|
||||
TColorStyle *pastedStyle = getPalette()->getStyle(styleId);
|
||||
|
|
Loading…
Reference in a new issue