Commit graph

47 commits

Author SHA1 Message Date
otakuto
6985407a96 remove duplicate include (#2271) 2018-10-31 12:00:01 +09:00
Jeremy Bullock
e23841235b
Merge pull request #1740 from shun-iwasawa/fix_plastic_black_contour
Fix Plastic Tool not to Create the Black Contour
2018-01-22 11:38:05 -07:00
shun_iwasawa
927bc0fbcc fix plastic black contour 2018-01-19 11:18:08 +09:00
shun_iwasawa
7e52a2e788 enlarge plastic texture 2018-01-12 21:12:24 +09:00
shun-iwasawa
5a2ff6d279 Add add_dependencies Command to CMake for OSX (#1587)
* fix cmake for osx

* try using make -j 2 for osx travis

* obtain qt5.9.2 from the previous homebrew
2017-11-24 13:10:45 +09:00
Ivan Mahonin
429ee8c8e4 Allow to cross compile for Windows with Linux/Mingw (part 3 of 3, cmake) (#1150)
* #mingw #cmake: rules for native and cross compilation

* #mingw #cmake: fix CMakeLists.txt for using with MinGW under Windows

* #mingw #cmake: fix typo (BUILD_ENV_WIN -> BUILD_ENV_MSVC)
2017-05-26 15:00:05 +09:00
Ivan Mahonin
e280ae86d6 Allow to cross compile for Windows with Linux/Mingw (part 1 of 3, preprocessor) (#1148)
* split _WIN32 and _MSC_VER, lowercase includes
2017-05-08 21:13:29 +09:00
Campbell Barton
993ef47bcc Fix error using malloc, then delete[] 2017-03-19 12:17:38 +11:00
jabarrera
3ebaf33693 Fix plastic tool crash with SuperLU 5.x
Fixes crash on Linux #623,
but allows updating thirdparty lib to 5.x too.
2016-12-13 12:01:27 +11:00
Campbell Barton
fb7729aaaf CMake: fix for SuperLU
It wasn't possible to use a custom superlu path.

- Added "superlu" onto the end of SUPERLU_INCLUDE_DIR
- Wasn't using SUPERLU_INCLUDE_DIR, instead used hard-coded path.
  Now use SUPERLU_INCLUDE_DIR on Linux,
  leave windows and macOS as-is with notice.
2016-12-13 12:01:27 +11:00
MCCCS
a0ce326e1b 🐛 Fix spelling mistakes 2016-09-07 16:28:50 +03:00
Campbell Barton
9ece9c0c92 Cleanup: CMake style
Use parens on newline, avoids diff-noise when adding values.
2016-07-23 04:59:47 +10:00
Campbell Barton
8c6c57f1b4 Enable missing-declarations warning (#643)
Finish ensuring symbols use headers correctly
2016-07-22 13:38:33 +09:00
Campbell Barton
a9c3dad75a CMake: differentiate system includes (#604) 2016-07-09 00:47:11 +09:00
Shinya Kitaoka
47895a0d7b Merge pull request #578 from opentoonz/warning-cleanup-pr
Quiet warnings
2016-07-06 19:24:49 +09:00
Shinya Kitaoka
c08330d1ae Merge pull request #567 from opentoonz/cmake-cleanup-defines-pr
CMake: use multi-line defines
2016-07-06 13:56:49 +09:00
Campbell Barton
e05b0bbe1c Quiet warnings 2016-07-05 14:54:52 +10:00
Shinya Kitaoka
fd19c4eedf Support Visual Studio 2015 (#544)
* Small changes, for some reason VS 2015 can't link cprintf and they added a second function std::map::count and bind couldn't resolve the function. Substituted with a lambda-expression.

* Created all 64bit version of the 3rd party libs.

* Cleanup popup opens CleanupSettings instead of CleanupSettingsPane. Not finished, panel is wrong now (also uses CleanupSettings).

* Tried to get Twain working, failed.

* When there are more then 3 peg holes create additional holes.

* When a hole touches the boundary it should still be considered a hole.

* Do not compare dot size against fixed size. Will not work in some scan resolutions. Used the same value (PERCENT * max dot size) as later in the code in compare_dots.

* When there are more than three peg holes the code looked for the best fit and used that. The problem was, that the middle hole was used as center for auto center. For three peg holes that is correct, but does not work for more than three. Now the best fit is calculated and from there the offset of the middle of the three best fit holes is calculated and applied.

* One of the last changes broke VS2015 compatibility, it chocked on a missing include.

* fix for msvs2013

* revert autopos.cpp

* apply clang-format

* use GIT-LFS
2016-07-04 17:50:30 +09:00
Campbell Barton
f2d492861f CMake: use multi-line defines
Easier to read and avoids merge conflicts
2016-07-02 22:23:18 +10:00
Campbell Barton
268e1b4036 CMake: quiet warnings
- OBJCSOURCES was being used but undefined (set to empty)
- RC_FILE was being used on Linux/OSX, this is only for WIN32.
2016-07-02 09:21:15 +10:00
Campbell Barton
f493896cc0 Cleanup: typo (sensibility) 2016-06-29 20:49:17 +10:00
Shinya Kitaoka
d1f6c4e95b REFACTORING: Add final specifiers (#537)
* add final specifiers

* apply clang-format

* fix for macOS
2016-06-29 15:17:12 +09:00
Shinya Kitaoka
38fd868138 apply clang-format 2016-06-20 11:34:17 +09:00
Shinya Kitaoka
473e70432a add override specifier 2016-06-20 11:34:15 +09:00
Campbell Barton
22fd3b0447 CMake: changes needed to build on Linux (#452)
Note that these are the main changes from the linux port.
Not a fully working linux port.
2016-06-16 13:52:02 +09:00
Shinya Kitaoka
120a6e041c apply clang-format 2016-06-15 15:43:10 +09:00
Shinya Kitaoka
ee259ffaf7 remove duplicated constants (#296) 2016-06-13 21:37:09 +09:00
tomosu
953a4a705d Use std::unique_ptr instead of UniquePtr in plasticdeformer.cpp (#332)
* replace UniquePtr with std::unique_ptr
2016-05-20 16:18:26 +09:00
Shinya Kitaoka
12c444ee0d use std::min and std::max (#318) 2016-05-18 13:03:37 +09:00
Shinya Kitaoka
8105532604 add #pragma once (#303) 2016-05-17 00:04:11 +09:00
Shinya Kitaoka
d4642c34e8 Remove macros: CASE, __OR, and DEFAULT (#286)
* remove syntax macros: CASE, __OR, and DEFAULT

* define VC_EXTRALEAN

* remove meaningless comments
2016-05-13 19:49:17 +09:00
Campbell Barton
f08982dd33 CMake: cleanup indentation, remove redundant endif args 2016-04-27 21:48:12 +10:00
Shinya Kitaoka
6f097405b3 Revert "Merge pull request #248 from skitaoka/fix/issue/134"
This reverts commit ebfd3b7b4d, reversing
changes made to 467e9d19ae.
2016-04-27 00:11:57 +09:00
Shinya Kitaoka
c7321c0d77 Revert "Merge pull request #251 from skitaoka/fix/remove-glext-h"
This reverts commit 86c457716a, reversing
changes made to ebfd3b7b4d.
2016-04-27 00:11:29 +09:00
Shinya Kitaoka
6bcca29276 remove glext.h 2016-04-26 22:12:56 +09:00
Shinya Kitaoka
7bc9064955 fix convert vector image to raster image issue
- remove NEW_REGION_FILL macro
- use glBlendFuncSeparate
- some refactoring
2016-04-26 18:40:16 +09:00
Shinya Kitaoka
3bfa549e8b remove "using"
- using std::string;
- using std::wstring;
- using std::ostream;
- using std::istream;
- using std::iostream;
- using std::ostrstream;
- using std::istrstream;
- using std::fstream;
2016-04-21 16:23:15 +09:00
Shinya Kitaoka
c12eacf2f3 remove #define NOMINMAX 2016-04-20 10:24:50 +09:00
Shinya Kitaoka
42bfb61883 remove delete[] 2016-04-20 10:24:47 +09:00
Shinya Kitaoka
9f5a1bd760 use _WIN32 instead of WIN32 2016-04-20 10:24:44 +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
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
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
107701249b Basic edits for Linux portability 2016-04-12 02:56:45 +10:00
Toshihiro Shimizu
890dddabbd first commit 2016-03-19 02:57:51 +09:00