Commit graph

81 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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