Shinya Kitaoka
70f81d091c
fix ImageRasterizer::build
2016-04-27 00:20:01 +09:00
Shinya Kitaoka
6f097405b3
Revert "Merge pull request #248 from skitaoka/fix/issue/134"
...
This reverts commit ebfd3b7b4d467e9d19ae
2016-04-27 00:11:57 +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
shun_iwasawa
36e06f3235
fix "library" and "fxs" folder locations
2016-04-25 18:45:04 +09:00
shun_iwasawa
723f49bcab
Merge remote-tracking branch 'origin/master' into add_save_all_command
2016-04-25 16:41:00 +09:00
shun_iwasawa
0b5f3366ed
add Save All command
2016-04-25 16:39:15 +09:00
shun_iwasawa
9fb611aa7a
Merge remote-tracking branch 'origin/master' into revert_key_on_xsheet
2016-04-22 20:33:35 +09:00
shun_iwasawa
9f6fb4f937
revert showing keys on xsheet
2016-04-22 20:31:38 +09:00
Keisuke Ogaki
b147ff3ff1
Merge pull request #204 from skitaoka/fix/step-by-step-improvement/remove-using
...
Remove `using std::foo` from headers
2016-04-21 16:24:27 +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
shun_iwasawa
2ca36a7344
small change
2016-04-20 17:30:15 +09:00
shun_iwasawa
2b222ee2c3
Merge remote-tracking branch 'origin/master' into fix_save_mesh
2016-04-20 16:38:27 +09:00
shun_iwasawa
4060ca35fe
fix save mesh
2016-04-20 16:15:01 +09:00
Shinya Kitaoka
eabf183e6e
fix namespace
2016-04-20 10:24:52 +09:00
Shinya Kitaoka
cba6a2c733
fix pointer operation
2016-04-20 10:24:52 +09:00
Shinya Kitaoka
ec43d4d5e6
add #include <cmath>
2016-04-20 10:24:51 +09:00
Shinya Kitaoka
61dd762587
add #include <cmath>
2016-04-20 10:24:50 +09:00
Shinya Kitaoka
c12eacf2f3
remove #define NOMINMAX
2016-04-20 10:24:50 +09:00
Shinya Kitaoka
2148c874dd
remove using namespace std; from headers
2016-04-20 10:24:48 +09:00
Shinya Kitaoka
6a4e01532c
remove
2016-04-20 10:24:46 +09:00
Shinya Kitaoka
79e39bd35a
remove
2016-04-20 10:24:46 +09:00
Shinya Kitaoka
9f5a1bd760
use _WIN32 instead of WIN32
2016-04-20 10:24:44 +09:00
shun_iwasawa
fe7dd3b14f
fix convert image bug
2016-04-18 23:23:21 +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
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
Campbell Barton
40cabe2c56
Include memory, needed for auto_ptr references
2016-04-17 15:56:16 +10: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
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
262a92f130
use smart pointer for m_imp
2016-04-14 19:15:09 +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
9c6c0f1688
Merge pull request #132 from janisozaur/parentheses
...
Encapsulate expressions in parentheses
2016-04-13 14:14:19 +09:00
Campbell Barton
d0e335dfee
Fix include case
2016-04-12 02:58:51 +10:00
Campbell Barton
107701249b
Basic edits for Linux portability
2016-04-12 02:56:45 +10: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
df394d6939
Move to stringstream
...
std::strstream is deprecated, stringstream is the suggested replacement.
2016-04-03 02:22:18 +02: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
22e1399821
Merge pull request #2 from opentoonz/mod_qss_problem
...
modification of style sheet problem
2016-03-23 23:49:05 +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
Toshihiro Shimizu
890dddabbd
first commit
2016-03-19 02:57:51 +09:00
