griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,502 Commits 1 Branch 0 Tags
f736f183a5b94ba80aaeb4cfef7ff1fb9d5f7850
Commit Graph

1677 Commits

Author SHA1 Message Date
Sergey Sharybin
3f5e3ae0bf Merging r49413 through r49450 from trunk into soc-2011-tomato 2012-08-01 14:14:22 +00:00
Campbell Barton
179d00fb9c make node select_all consistent with other select operators, also add Ctrl+I, select inverse to node space. 2012-08-01 13:28:19 +00:00
Campbell Barton
0fee289551 style cleanup: >120 line length 2012-08-01 10:44:55 +00:00
Sergey Sharybin
9811e847ca Fix #32209: Autosave ignores multires sculpting 
Use a bit different fix, which gets active scene from context and
uses this scene to figure out active object instead of itterating
through all the objects.
 2012-08-01 09:04:40 +00:00
Campbell Barton
a199ae5368 style cleanup: whitespace, also add '?' to save over popup since it wasnt totally clear it was a question (user pointed this out, they thought it was just notification and lost their work). 2012-07-31 23:06:12 +00:00
Campbell Barton
a70a48814e fix [#32232] Running script that changes area.type crashes blender. 
(reported the bug to keep some reference to the script that crashes).
 2012-07-31 22:15:54 +00:00
Sergey Sharybin
49e0c832e1 Move sRGB conversion initialization to init_exit routines 
It was a threading issue in color management project which potentially
could happen in trunk as well.
 2012-07-27 14:53:57 +00:00
Sergey Sharybin
a63ffa9ae3 Merging r49281 through r49286 from trunk into soc-2011-tomato 2012-07-27 11:07:55 +00:00
Jason Wilkins
6926e924c0 GetStdHandle may return NULL, which isn't really an error, or INVALID_HANDLE_VALUE which does indicate an error, but both should be checked. 2012-07-27 10:48:33 +00:00
Campbell Barton
ae5fc40a63 svn merge ^/trunk/blender -r49256:49260 2012-07-26 17:15:28 +00:00
Jason Wilkins
6b3b7465b6 On windows with --debug flag, change "Press enter key to exit..." to "Press any key to exit . . .". This is implemented by the new function wait_for_console_key. 2012-07-26 16:56:09 +00:00
Sergey Sharybin
0051d24b23 Merging r49191 through r49211 from trunk into soc-2011-tomato 2012-07-25 15:07:47 +00:00
Campbell Barton
071a1034d6 add mask keymap to image window. 
debug prints for events when --debug-events is used to help track down why a key is/isnt used.
 2012-07-25 14:46:38 +00:00
Campbell Barton
371e259a0b svn merge ^/trunk/blender -r49037:49061 2012-07-19 10:29:39 +00:00
Campbell Barton
250cdd5e52 code cleanup: remove commented includes - mostly from 2.4x 2012-07-18 23:07:07 +00:00
Sergey Sharybin
1f66c7eeca Merging r49020 through r49024 from trunk into soc-2011-tomato 2012-07-18 11:49:18 +00:00
Campbell Barton
8f32070e9d fix incorrect assert for mask face checking, also correct own bad spelling 2012-07-18 11:01:23 +00:00
Sergey Sharybin
c415a01fea Merging r48992 through r48995 from trunk into soc-2011-tomato 2012-07-17 10:46:32 +00:00
Campbell Barton
29bc3d7024 fix for scons building with compositor 2012-07-17 10:38:22 +00:00
Campbell Barton
f9795b353e fix for building without the compositor 2012-07-17 10:19:47 +00:00
Campbell Barton
43fede9519 svn merge ^/trunk/blender -r48986:48991 2012-07-17 09:58:20 +00:00
Campbell Barton
32cf7fcdb1 code cleanup: spelling 2012-07-16 23:23:33 +00:00
Campbell Barton
284d9422f4 svn merge ^/trunk/blender -r48937:48953 2012-07-16 08:48:06 +00:00
Campbell Barton
4cacff2342 fix for linking with scons. 2012-07-16 08:42:55 +00:00
Sergey Sharybin
0c087e5154 Merging r48928 through r48937 from trunk into soc-2011-tomato 2012-07-15 10:51:36 +00:00
Campbell Barton
7cc5af4ef3 minor refactor for rect functions. more consistent naming. 2012-07-15 00:29:56 +00:00
Sergey Sharybin
8764e7507f Merging r48829 through r48861 from trunk into soc-2011-tomato 2012-07-12 12:12:21 +00:00
Thomas Dinges
4f5d982fb1 Readme and Release Log Links: 
* Update to 2.64
 2012-07-11 21:57:11 +00:00
Campbell Barton
a5127dba57 vector versions of BLI_in_rctf / BLI_in_rcti, (BLI_in_rctf_v, BLI_in_rcti_v) 
use where possible.
 2012-07-11 18:17:48 +00:00
Campbell Barton
37e73082ab play animation now works switching between scrubbing and pingpong 2012-07-08 18:20:29 +00:00
Campbell Barton
1bca7fe492 svn merge ^/trunk/blender -r48691:48729 2012-07-08 15:55:58 +00:00
Campbell Barton
cfb7aee017 style cleanup 2012-07-07 22:51:57 +00:00
Campbell Barton
84bf3e48c0 style cleanup: use c style comments in C code 2012-07-06 23:56:59 +00:00
Campbell Barton
3c367f924a svn merge ^/trunk/blender -r48604:48638 2012-07-05 11:40:48 +00:00
Campbell Barton
9f22750422 style cleanup 2012-07-04 20:47:12 +00:00
Campbell Barton
48d0d32f73 svn merge ^/trunk/blender -r48585:48604 2012-07-04 17:55:30 +00:00
Bastien Montagne
558721ab59 More spell checking. 2012-07-04 15:04:38 +00:00
Campbell Barton
438b77e5d4 fix for building with windows. 2012-07-04 12:36:43 +00:00
Sergey Sharybin
17d7a9c3d9 Merging r48545 through r48574 from trunk into soc-2011-tomato 2012-07-04 07:33:34 +00:00
Campbell Barton
e505ab8ad2 add support for scrubbing with the mouse 2012-07-03 22:58:43 +00:00
Campbell Barton
c1493432a3 most keyboard events working again, but no scrub 2012-07-03 22:10:59 +00:00
Jens Verwiebe
223cdefbf5 make the last fix unhackish 2012-07-03 19:40:01 +00:00
Bastien Montagne
468ef74ed7 More spell and typo fixes (mostly visualise->visualize, grey->gray, normalise->normalize). 2012-07-03 19:09:07 +00:00
Jens Verwiebe
d8f9a2c45f some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs 2012-07-03 19:03:52 +00:00
Campbell Barton
5593100b35 basic events quit and resize window now work 
text draws again.
 2012-07-02 23:01:04 +00:00
Sergey Sharybin
e0c7c4fec4 Tomato: enable color management by default for Windows 
This commit enables color management stuff when building on
Windows using MSVC 2008 compiler. This required some fixes
to both CMake and SCons configurations which were tested for
64bit target. Tests of 32bit target would be welcome.

Also solved compilation error caused by recently added anim
player. Not sure how to test this, but it shall  at least
compile on Windows now.

Didn't test MinGW compilation at all yet, could still be buggy.
 2012-07-02 20:38:57 +00:00
Sergey Sharybin
896fb9fda7 Color management refactor 
- Move color management display settings into own structure like it's
  done for view settings.

  This is helpful from two sides:

  * It is planned to support display calibration settings which
    should be taken into account by color management stuff to
    add needed transformations to OCIO processor.
  * File saving should be able to make the same display
    transformations as it's done by window when displaying the image.
    Having own DNA and RNA structures for display device settings
    helps avoiding having duplicated code.

- Small refactor of cacheing functions which are now accepts
  cache-like versions of view and display settings. This structures
  used for cache are quite the same as DNA structures but they contains
  indices of view and display which avoids extra lookup for this
  things.

  This also helps having reasonable amount of variables passing
  to cache functions.
 2012-07-02 16:37:40 +00:00
Sergey Sharybin
11b0e4866e Merging r48470 through r48489 from trunk into soc-2011-tomato 2012-07-02 11:29:55 +00:00
Campbell Barton
72251e548e code cleanup 2012-07-02 09:07:34 +00:00
Campbell Barton
1b937dbf87 code cleanup 2012-07-02 08:37:59 +00:00