Commit graph

2282 commits

Author SHA1 Message Date
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
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
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
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
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
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
shun_iwasawa
b05ca51266 revert room edit feature 2016-04-07 16:09:59 +09:00
Campbell Barton
5db682049d Remove redundant array allocation 2016-04-07 14:38:39 +10:00
shun_iwasawa
0732762e90 Merge remote-tracking branch 'origin/master' into fix_loading_reslist 2016-04-06 13:58:55 +09:00
shun_iwasawa
2e13bcc2f6 fix loading reslist 2016-04-06 13:53:42 +09:00
Yuri Odagiri
6cd606de62 Merge pull request #47 from camjc/master
Fix: User facing typos throughout application
2016-04-06 12:19:10 +09:00
shun_iwasawa
49ff76e3d3 Merge remote-tracking branch 'origin/master' into revert_schematic_output_port 2016-04-04 19:05:17 +09:00
shun_iwasawa
22eaa48951 revert schematic output port 2016-04-04 19:03:52 +09:00
Michał Janiszewski
b1cc3ceeac Encapsulate expressions in parentheses
Some expressions appear to be confusing, adding parentheses removes
doubt in those cases.
2016-04-03 02:24:43 +02:00
Michał Janiszewski
0585eef453 Fixes for abs()
abs() only returns integer values, while arguments and results are real
in the cases fixed.

Also fixes some unexpected tokens after `#endif`.
2016-04-03 02:23:59 +02:00
Michał Janiszewski
df394d6939 Move to stringstream
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02:00
Campbell Barton
42d601e918 Use #error preprocessor
We had a report (that I can't confirm), that this caused errors.
Best to use `error` here.
2016-04-01 05:19:41 +11:00
jpumc
a8cd98dd0c Fix CMAKE_MODULE_PATH for out-of-source build 2016-03-31 17:09:25 +03:00
brly
fed8a75dde Fix compile error on clang
Avoid 'chosen constructor is explicit in copy-initialization' error.
2016-03-31 01:24:00 +09:00
Adric Worley
fe9b8bc573 Fixes unused label warning.
Commented out instead of deleted, as label is referenced by FIXME comment and associated goto on lines 82-84.
2016-03-30 09:28:32 -04:00
Adric Worley
f63c1a0076 Fixes unreferenced local variable warnings.
Deleted variables in most cases. Commented out or moved to IFDEF where referenced by existing but disabled code.
2016-03-30 09:25:34 -04:00
roentgen
46416c1cad Merge pull request #64 from ideasman42/linux-resource-case-fix
Linux: Use lowercase for all resources (failed to build)
2016-03-30 02:09:49 +09:00
Gabriel Gazzán
d9d05a72fe Spanish UI - toonzlib.ts [100%] 2016-03-29 13:10:29 -03:00
Gabriel Gazzán
27e293b565 Spanish toonzqt.ts - minor fix 2016-03-29 03:50:52 -03:00
Gabriel Gazzán
720ea50bec Spanish UI toonzqt.ts - [100%] 2016-03-29 03:07:31 -03:00
Campbell Barton
b696885d9a Fix error with ifdef blocks
noted by @linkmauve
2016-03-29 15:49:16 +11:00
Gabriel Gazzán
3d229965a5 Spanish UI colorfx.ts - [100%] 2016-03-28 13:40:18 -03:00
Michael Cullen
b49802832b Fix build when libtiff exists on system
On OSX at least, if you have libtiff in your system include path,
it will use that instead of the bundled modified version even if
FindTIFF.cmake locates the correct version. This commit fixes that
by making sure the libtiff include directory is before the system
include paths.
2016-03-28 14:50:54 +01:00
Gabriel Gazzán
5b89978306 Spanish translation - tnztools.ts [100%] 2016-03-27 22:05:15 -03:00
Gabriel Gazzán
99a642865e Spanish translation - tnzcore.ts [100%] 2016-03-27 22:04:34 -03:00
Gabriel Gazzán
a31c6d5bd6 Spanish UI translation - [0%]
Initial commit, copied from the Italian folder.
All strings in files reverted to suggested translations.
2016-03-27 19:25:18 -03:00
Campbell Barton
3dcf6bfa09 CMake: use tab indentation & whitespace edits 2016-03-27 14:44:29 +11:00
Campbell Barton
cc5860ee72 Use lowercase for all resources (failed to build on Linux) 2016-03-27 11:50:14 +11:00
Campbell Barton
1db1c004b9 Linux: frameserver memory fix 2016-03-27 11:17:15 +11:00
roentgen
25e5605c50 Merge pull request #36 from ArseniyShestakov/fix-cmake-lettercase
Fix letter case in CMakeLists.txt
2016-03-27 02:11:52 +09:00
kusano
ffc911474d Fix crash in initializing
In some enviroment, access violations occures in ICOpen.
Althogh this code seems to intended to handle SEH, structured exceptions are not catched in current configulation.
2016-03-27 01:02:54 +09:00
Cameron Chamberlain
bfee0019b7 Fix: User facing typos throughout application
- inbeteween -> inbetween
- abount -> about
- seleted -> selected
- successfull -> successful
- undefinied -> undefined
- colonnesdoivent (fr) -> colonnes doivent
- seleted (fr) -> sélectionnés
- cleeanup -> removed from translations,
  wasn't translated anyway and
  was removed from english codebase
2016-03-26 22:30:38 +11:00
Arseniy Shestakov
5e9e969bb2 Fix letter case in CMakeLists.txt 2016-03-26 06:16:40 +03:00
roentgen
7e185111a8 Merge pull request #33 from opentoonz/export-pluginsdk
added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h ar…
2016-03-25 20:28:53 +09:00
roentgen
edd579074d added package_sdk.sh to export the sdk. and toonz_plugin_helper*.h are moved to utils dir to plublic developers 2016-03-25 20:25:20 +09:00
Toshihiro Shimizu
5dddbf3dad Merge pull request #24 from opentoonz/suppress-warning-C4819
Suppress warning C4819 in Visual Studio 2013
2016-03-25 19:40:52 +09:00
roentgen
f09e094840 Merge pull request #30 from opentoonz/fix-lzodriver
we always have thirdparty/lzo/driver. osx build never uses thirdpary/…
2016-03-25 18:55:07 +09:00
roentgen
3047bb2598 we always have thirdparty/lzo/driver. osx build never uses thirdpary/lzo/lzo-2.09 (was removed) 2016-03-25 18:42:18 +09:00
kusano
52db9569b3 Force Qt to use desktop OpenGL
since currently OpenToonz does not work with OpenGL of software or angle.
2016-03-25 02:37:28 +09:00
brly
591f925dea Replace dialog title 2016-03-25 00:33:35 +09:00
roentgen
1deca7fc99 Merge pull request #23 from opentoonz/remove-zlib-1.2.7
Remove zlib 1.2.7
2016-03-25 00:13:35 +09:00
roentgen
ce9322ff3c Merge pull request #22 from opentoonz/fix_save_palette_dialog
パレット上書きの確認ダイアログに関する修正
2016-03-25 00:13:19 +09:00
roentgen
ab18c9f671 fixed create full menubar for OSX 2016-03-25 00:07:43 +09:00
kusano
543ae709dc Suppress warning C4819 in Visual Studio 2013
"The file contains a character that cannot be represented in the current code page"
2016-03-24 20:30:47 +09:00
kusano
8977366225 Remove zlib 1.2.7 2016-03-24 19:57:01 +09:00
shun_iwasawa
b64fce383e comment added 2016-03-24 17:55:39 +09:00
shun_iwasawa
01d49686ac Merge remote-tracking branch 'origin/master' into fix_save_palette_dialog 2016-03-24 17:54:26 +09:00
shun_iwasawa
9ff2b3eb00 fix overwrite palette confirmation dialog 2016-03-24 17:47:57 +09:00
roentgen
b94d31fa75 Merge pull request #20 from opentoonz/fix-param-fx2
エフェクトファイルを含むシーンファイルを 2 回連続で開くと落ちるバグを修正
2016-03-24 17:28:33 +09:00
shun_iwasawa
f81af248fc fix save raster level problem 2016-03-24 16:51:41 +09:00
Shinya Kitaoka
f91c5a5f05 remove cloning flag 2016-03-24 16:28:15 +09:00
Shinya Kitaoka
0b19cb0c6a move params_ from PluginInformation to RasterFxPluginHost 2016-03-24 16:08:18 +09:00
kusano
45254b4069 Fix libpng version in CMakeLists.txt 2016-03-24 05:01:24 +09:00
roentgen
87fce823c5 OSX: use presented libpng 2016-03-24 04:33:12 +09:00
roentgen
42a3d520c4 Merge pull request #15 from opentoonz/fix-thirdparty
Fix thirdparty
2016-03-24 04:15:01 +09:00
roentgen
237d095463 Merge pull request #14 from opentoonz/fix-thirdparty-win
Visual Studioと更新されたthirdparty/でビルドができるように各種修正
2016-03-24 04:12:05 +09:00
kusano
6139acbd31 Make tiio_tif.cpp use io.h instead of unistd.h in Visual Studio 2016-03-24 04:04:53 +09:00
kusano
3f512259eb Update CMakeLists.txt for Visual Studio
- add libpng
- change libtiff path
2016-03-24 04:03:50 +09:00
fukasawa
13abb65b48 fixed aborting on png-level loading 2016-03-24 03:07:46 +09:00
fukasawa
9c02f65f6e added custom module for cmake 2016-03-24 02:27:13 +09:00
roentgen
bbd970be69 Merge pull request #11 from opentoonz/fix-boost
Fix for Boost 1.60
2016-03-24 01:03:27 +09:00
fukasawa
39e85d1a80 Merge remote-tracking branch 'origin' into fix-thirdparty 2016-03-24 00:56:29 +09:00
fukasawa
e60969f67f moved to libpng and libtiff to thirdparty 2016-03-24 00:50:22 +09:00
kusano
92d713df09 Remove unused members in TFlash 2016-03-24 00:49:38 +09:00
kusano
a0ab5dec40 Fix the compile error in tflash.h
Member functions with argument of vector<TSegment> or vector<TQuadratic> cannot be inline defined.
2016-03-24 00:43:29 +09:00
kusano
66e8e342f4 Fix for Boost 1.60 2016-03-23 23:58:33 +09:00
roentgen
e40e2eea0a Merge pull request #10 from opentoonz/fix-check_framebuffer_status
glCheckFramebufferStatusEXTが無い環境で起動直後に落ちる問題を修正
2016-03-23 23:54:23 +09:00
roentgen
58d3d79de2 Merge pull request #9 from opentoonz/feature-remove-unused-codes
Remove unused codes
2016-03-23 23:53:44 +09:00
roentgen
f5fdb6e866 Merge pull request #8 from opentoonz/add-tfarm-plugin
tfarmをプラグインのフィルタに対応させた
2016-03-23 23:53:17 +09:00
roentgen
ca2f385a36 Merge pull request #7 from opentoonz/feature-osx-icon
Add Icon and Modify toonz/CMakeLists.txt for OSX Bundle
2016-03-23 23:52:56 +09:00
roentgen
b91a1bcd5d Merge pull request #3 from opentoonz/fix-param-dup
PluginInformation に Param が重複して登録されるバグを修正
2016-03-23 23:52:41 +09:00
roentgen
a52ebf554f Merge pull request #6 from opentoonz/add-large-icon
Add 256x256 to toonz.ico
2016-03-23 23:51:31 +09:00
roentgen
d0ec773d4e Merge pull request #4 from opentoonz/loc_jp
Japanese Localization
2016-03-23 23:51:15 +09:00
roentgen
22e1399821 Merge pull request #2 from opentoonz/mod_qss_problem
modification of style sheet problem
2016-03-23 23:49:05 +09:00
kusano
297d92b914 Fix a issue of hang in case of no glCheckFramebufferStatusEXT 2016-03-23 23:47:45 +09:00
brly
9e73b85832 Remove TFlash::Imp class and sources/common files 2016-03-23 23:32:56 +09:00
kusano
898953fe78 Add an empty directory stuff/toonzfarm, which is necessary for tfarmserver 2016-03-23 20:45:27 +09:00
kusano
46ab69e306 Enable tcomposer to render scenes with plugin filters 2016-03-23 20:37:22 +09:00
brly
8064cbf365 Add Icon and Modify toonz/CMakeLists.txt for OSX Bundle 2016-03-23 19:11:31 +09:00
kusano
c8190fa92d Add 256x256 to toonz.ico 2016-03-23 17:26:12 +09:00
brly
f20acf84e8 Remove glext.h from codebase 2016-03-23 16:09:00 +09:00
roentgen
71f5e9deb4 moved RGBA64 support to libtiff from toonz/sources/image/tif 2016-03-23 04:32:55 +09:00
roentgen
b75cab9b67 added tiff-4.0.4 2016-03-23 04:20:01 +09:00
roentgen
19af1bad04 use cmake modules for superlu and lzo.
use pkg-config for usb, glew and lz4(not static).
(WIP) fixed getting kinda hack for tiff out to libtiff
2016-03-23 03:48:01 +09:00
shun_iwasawa
9f007d60e9 japanese localization 2016-03-22 16:03:41 +09:00
Shinya Kitaoka
f8aefde0c9 fix param dup bug 2016-03-22 16:01:50 +09:00
shun_iwasawa
6c7e74ae4c modify qss problem 2016-03-22 15:04:28 +09:00
shun_iwasawa
28dc08231d modify problem in new project 2016-03-22 12:59:10 +09:00
roentgen
3969d9617b added local macros for thirdpary libraries.
(WIP) fixed tiio_tif does not be compilable with libtiff4-package (it needs libtiff4's source code).
2016-03-22 04:26:56 +09:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00