Commit graph

135 commits

Author SHA1 Message Date
Shinya Kitaoka
5f2af016ab add move constructors 2016-04-19 16:54:53 +09:00
kogaki
4edae4f691 Merge pull request #197 from shun-iwasawa/fix_convert_image_bug
Fix convert image bug
2016-04-18 23:24:30 +09:00
shun_iwasawa
fe7dd3b14f fix convert image bug 2016-04-18 23:23:21 +09:00
shun_iwasawa
74e2cb1469 Merge remote-tracking branch 'origin/master' into revert_room_feature 2016-04-18 22:33:55 +09:00
kogaki
5bbc3c26fa Revert "Remove strstream" 2016-04-18 22:16:18 +09:00
kogaki
417c1d6f96 Merge pull request #169 from skitaoka/fix/remove-strstream
Remove strstream
2016-04-18 19:14:23 +09:00
kogaki
8f50ce17db Merge pull request #168 from skitaoka/fix/motionblurfx
Fix memory allocation at doDirectionalBlur
2016-04-18 19:13:50 +09:00
shun_iwasawa
99cef5a25e fix osx build error 2016-04-18 19:02:48 +09:00
shun_iwasawa
0133209a76 Merge remote-tracking branch 'origin/master' into revert_room_feature 2016-04-18 17:09:56 +09:00
shun_iwasawa
2d840616e6 add template layout settings 2016-04-18 17:06:30 +09:00
Shinya Kitaoka
0066b8a986 Merge pull request #187 from ideasman42/patch-1
Replace deprecated LOCATION with target properties
2016-04-18 14:46:46 +09:00
Shinya Kitaoka
4ff9cf9c92 Merge pull request #188 from ideasman42/cmake-typo-fix
CMake: typo fix
2016-04-18 14:45:31 +09:00
Shinya Kitaoka
9f9952eaff Merge pull request #189 from ideasman42/fix-const-enum-error
Fix const enum which is an error with GCC5.3
2016-04-18 14:45:18 +09:00
Shinya Kitaoka
07d4ebbb34 Merge pull request #186 from ideasman42/linux-include-auto_ptr-fix
Include memory, needed for auto_ptr references
2016-04-18 13:29:40 +09:00
shun_iwasawa
dde155b61c enable customizing menubar 2016-04-18 12:17:03 +09:00
Campbell Barton
0b592fac5f Fix const enum which is an error with GCC5.3 2016-04-18 04:48:38 +10:00
Campbell Barton
bf80fb1686 CMake: typo fix 2016-04-18 04:43:41 +10:00
Campbell Barton
84ab18ab5c CMake: remove deprecated get_target_property 2016-04-17 16:48:15 +10:00
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
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
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
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
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
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
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
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