razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Build fixes

Browse source
This commit is contained in:
Jeremy Bullock 2020-05-23 15:03:08 -06:00
parent 624c5a7b4b
commit f95a5823d0
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
toonz/sources/stopmotion/stopmotion.cpp
View file

@ -1876,10 +1876,11 @@ void StopMotion::directDslrImage() {
saveTestShot(); saveTestShot();
else else
importImage(); importImage();
#ifdef WITH_CANON
if (m_canon->m_liveViewExposureOffset != 0) { if (m_canon->m_liveViewExposureOffset != 0) {
m_canon->setShutterSpeed(m_canon->m_realShutterSpeed, false); m_canon->setShutterSpeed(m_canon->m_realShutterSpeed, false);
} }
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
@ -1918,13 +1919,16 @@ void StopMotion::takeTestShot() {
} }
m_isTestShot = true; m_isTestShot = true;
if (m_usingWebcam) { if (m_usingWebcam) {
if (m_light->useOverlays()) { if (m_light->useOverlays()) {
m_light->showOverlays(); m_light->showOverlays();
m_webcamOverlayTimer->start(500); m_webcamOverlayTimer->start(500);
} else { }
saveTestShot(); else {
} saveTestShot();
} else { }
}
#ifdef WITH_CANON
else {
TApp *app = TApp::instance(); TApp *app = TApp::instance();
ToonzScene *scene = app->getCurrentScene()->getScene(); ToonzScene *scene = app->getCurrentScene()->getScene();
TFilePath parentDir = scene->decodeFilePath(TFilePath(m_filePath)); TFilePath parentDir = scene->decodeFilePath(TFilePath(m_filePath));
@ -1934,11 +1938,10 @@ void StopMotion::takeTestShot() {
TSystem::mkDir(parentDir); TSystem::mkDir(parentDir);
} }
m_tempFile = tempFile.getQString(); m_tempFile = tempFile.getQString();
#ifdef WITH_CANON
m_light->showOverlays(); m_light->showOverlays();
m_canon->takePicture(); m_canon->takePicture();
#endif
} }
#endif
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

9
toonz/sources/toonzqt/styleselection.cpp
View file

@ -1100,14 +1100,7 @@ void TStyleSelection::pasteStylesValues(bool pasteName, bool pasteColor) {
dstType = LINKEDSTYLE; dstType = LINKEDSTYLE;
//---- 追加ここまで iwasawa //---- 追加ここまで iwasawa
// For cleanup styles, do not duplicate the cleanup information. Just palette->setStyle(styleId, data->getStyle(i)->clone());
// 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());
// Process the global and original names according to the pasted style // Process the global and original names according to the pasted style
TColorStyle *pastedStyle = getPalette()->getStyle(styleId); TColorStyle *pastedStyle = getPalette()->getStyle(styleId);