Commit graph

1339 commits

Author SHA1 Message Date
Campbell Barton
40cabe2c56 Include memory, needed for auto_ptr references 2016-04-17 15:56:16 +10:00
Shinya Kitaoka
94f329e8fb fix tsound_mac.cpp 2016-04-15 18:03:25 +09:00
Shinya Kitaoka
387b337fba fix TOStream 2016-04-15 17:38:33 +09:00
Shinya Kitaoka
c3fda32ba4 fix TOfflineGL::Imp 2016-04-15 14:42:51 +09:00
Shinya Kitaoka
a85aeb719a Merge remote-tracking branch 'upstream/master' into fix/reduce-boost-dependencies
# Conflicts:
#	toonz/sources/include/tfarmtask.h
2016-04-15 14:28:42 +09:00
Shinya Kitaoka
a09dc1b458 Merge pull request #61 from ideasman42/linux-frameserver-sysconf-fix
Linux: Frameserver system memory access
2016-04-15 13:42:46 +09:00
Shinya Kitaoka
06e491a6f7 Merge pull request #62 from ideasman42/linux-header-case-fix
Linux: Use correct upper/lower case for includes
2016-04-15 13:42:35 +09:00
Shinya Kitaoka
e938cfcdc7 Merge pull request #63 from ideasman42/linux-basic-portability
Linux: Basic portability edits
2016-04-15 13:42:07 +09:00
Stephen Shkardoon
3d9be09db0 Upgrade to Qt5.6
Fix #109 #138 #165 #178.
Fixes multiple issues on Windows 10.
2016-04-15 10:35:49 +12:00
Stephen Shkardoon
e239ec6928 Allow building with a newer version of Boost (up to 1.60.0).
The instructions for both OSX and Windows still say to use 1.55.0,
but cmake will allow up to 1.60.0.
Using a later version will also mean the additional patch for VS2013
is not required.
2016-04-15 05:42:58 +12:00
Shinya Kitaoka
fa76aefa90 cosmetic change 2016-04-14 19:36:34 +09:00
Shinya Kitaoka
262a92f130 use smart pointer for m_imp 2016-04-14 19:15:09 +09:00
Shinya Kitaoka
d57726081c remove BOOST_NO_RVALUE_REFERENCES 2016-04-14 16:55:33 +09:00
Shinya Kitaoka
e5734ac437 replace smart pointers 2016-04-14 16:51:50 +09:00
Shinya Kitaoka
8962b5c86b Merge pull request #174 from kusano/fix-multi-monitors-crash
Workaround for crash in multiple monitors
2016-04-14 14:15:52 +09:00
kusano
d652c1303c Workaround for crash in multiple monitors
See QTBUG-48288.
Qt may crash in handling WM_SIZE of m_sceneViewer in splash.finish(&w) in main.cpp.
To suppress sending WM_SIZE, set window position before splash.finish(&w).
WM_SIZE will not be sent if window poistion is not changed.
2016-04-14 05:01:56 +09:00
tomosu
5b8a0fc087 Merge pull request #172 from kogaki/fix/abs
Fix to include cmath
2016-04-13 20:04:55 +09:00
Keisuke Ogaki
e76b224937 fix to include cmath
this fixes commit#6dca1d3a6d64f6b55d5545fd209acc0f81aab9ec
in OSX, need to include cmath to use std::abs
2016-04-13 19:25:54 +09:00
Shinya Kitaoka
791cd10a98 Merge pull request #147 from ideasman42/tstroke-remove-redundant-array
Remove redundant array allocation
2016-04-13 14:58:08 +09:00
Shinya Kitaoka
02faf221f5 Merge pull request #135 from kogaki/fix/osx_build
fix OSX build
2016-04-13 14:34:48 +09:00
Shinya Kitaoka
56e1f6df66 remove freeze() 2016-04-13 14:28:07 +09:00
kogaki
9fbffc4177 Merge pull request #163 from xenogenesi/fix-sceneviewer-rightbtn
non-windows: fake mouse right release event on contextMenuEvent
2016-04-13 14:19:52 +09:00
Shinya Kitaoka
bb0ccfd485 Merge branch 'janisozaur-stringstream' into fix/remove-strstream 2016-04-13 14:19:41 +09:00
Shinya Kitaoka
16a82fca96 Merge branch 'stringstream' of https://github.com/janisozaur/opentoonz into janisozaur-stringstream 2016-04-13 14:18:53 +09:00
Shinya Kitaoka
8c5f687a8c Merge pull request #117 from jpumc/patch-oos-build-1
Fix CMAKE_MODULE_PATH for out-of-source build
2016-04-13 14:14:56 +09:00
Shinya Kitaoka
9c6c0f1688 Merge pull request #132 from janisozaur/parentheses
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Shinya Kitaoka
6dca1d3a6d Merge pull request #131 from janisozaur/abs
Fixes for abs()
2016-04-13 14:12:56 +09:00
Shinya Kitaoka
bbf7b2dac8 Merge pull request #120 from ideasman42/linux-preproc-error-fix
Use #error directive instead of explicit syntax error
2016-04-13 14:12:16 +09:00
Shinya Kitaoka
7ac5ba3eff Merge pull request #111 from OriginalAdric/fix_unrefd_locals
Fix unreferenced locals/labels warnings
2016-04-13 14:11:27 +09:00
Shinya Kitaoka
818c53f8aa Merge pull request #95 from kusano/fix-lzocompress
Fix crash of lzocompres and lzodecompress
2016-04-13 14:10:51 +09:00
Shinya Kitaoka
5f610203fc Merge pull request #70 from ideasman42/cmake-whitespace-cleanup
CMake: use spaces for indentation & whitespace edits
2016-04-13 14:10:04 +09:00
Shinya Kitaoka
6aada0ab29 use unique_ptr<> 2016-04-13 13:30:02 +09:00
Shinya Kitaoka
8e8a63e4a4 Merge branch 'marcab-master' into fix/motionblurfx 2016-04-13 13:17:08 +09:00
shun_iwasawa
7a9c88552b create custom menubar from xml file 2016-04-13 11:45:28 +09:00
xenogenesi
456038b5ce non-windows: fake mouse right release event 2016-04-12 18:11:03 +02:00
John Davidson
9980bf84e0 Use 'delete' on a 'new' object in motionblurfx.cpp. 2016-04-11 23:10:16 -07:00
Campbell Barton
d0e335dfee Fix include case 2016-04-12 02:58:51 +10:00
Campbell Barton
0648b484bf Use if defined(...) style 2016-04-12 02:56:45 +10:00
Campbell Barton
acc5e60836 Remove ifdef's for cstring includes
These are needed on Linux for memcpy, memmove etc... but not unique to Linux of course.
2016-04-12 02:56:45 +10:00
Campbell Barton
b66df2a0d6 Use strtok_r for Linux
Makes sense to use same logic for OSX and Linux
2016-04-12 02:56:45 +10:00
Campbell Barton
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
walkerka
0786d1117e added a "Save All" menu which saves current scene and all the levels. 2016-04-08 21:32:25 +08:00
kogaki
79d38796c4 Merge pull request #150 from henrich/master
remove unnecessary backup files (.bak)
2016-04-08 20:44:15 +09:00
tomosu
5545c5bfbd Merge pull request #151 from kogaki/fix/cmake_png_include
Fix cmake to be able to search custom libpng include path
2016-04-08 20:25:58 +09:00
kogaki
6f84e74154 Merge pull request #152 from tomosu/fix_rclick_osx
add clean-up at the end of SceneViewer::contextMenuEvent for OSX
2016-04-08 20:08:09 +09:00
tomosu
cb0b4d066f change clean-up location and add comment 2016-04-08 19:51:23 +09:00
tomo-suzuki
e6f45b6a60 add clean-up at the end of SceneViewer::contextMenuEvent 2016-04-08 11:56:21 +09:00
Keisuke Ogaki
b22d0cfb59 Add libpng include path search 2016-04-08 00:17:03 +09:00
Hideki Yamane
2dcddaf334 remove unnecessary backup files
It should be removed before upload... :)
2016-04-08 00:02:11 +09:00
shun_iwasawa
b05ca51266 revert room edit feature 2016-04-07 16:09:59 +09:00