Commit Graph

2443 Commits

Author SHA1 Message Date
Sergey Sharybin
8764e7507f Merging r48829 through r48861 from trunk into soc-2011-tomato 2012-07-12 12:12:21 +00:00
Jens Verwiebe
30b3907128 OSX: make the progressbar in dock a gradient, to give it a more matching 3D appearance 2012-07-12 11:35:51 +00:00
Sergey Sharybin
a87051bd8e Patch #32074: Fix compilation with boost 1.50
This patch switches from boost's filesystem v2 to v3.

This should be completely smooth due to filesystem v3 is pretty
old already.

Patch by Sven-Hendrik Haase (aka svenstaro), thanks!
2012-07-11 14:48:47 +00:00
Sergey Sharybin
a8fe0087f0 Merging r48826 through r48828 from trunk into soc-2011-tomato 2012-07-11 10:39:08 +00:00
Campbell Barton
35b6f41f46 patch [#30274] XIM improvement (non-latin support + connection recovery)
from Shinsuke Irie (irie)

(from the tracker submission)

- allow us to input non-latin languages such as Japanese/Chinese
- recover XIM connection and its input contexts when XIM server restarted

Currently it supports only "root window" style input, while most people (and I) want "over the spot" or "on the spot" style one. Probably the implementation of "over the spot" or "on the spot" style becomes much complicated, because XIM server requires the coordinates of current cursor location relative to the screen in order to show the candidate window in appropriate position.
2012-07-11 08:31:54 +00:00
Brecht Van Lommel
26f6913516 Cycles: blended box mapping support for image texture node. This enabled by
selecting Box instead of Flat as projection, and then setting the blend value.
Blend 0.0 will not do any blending between box sides, higher values will give
a smooth transition between the sides

This is useful for mapping image texture without too obvious patterns in a
way that looks seamless, without the need for UV mapping. This works basically
the same as the mango node setup that was posted, just a bit faster:

http://mango.blender.org/production/blended_box/
2012-07-11 00:08:42 +00:00
Sergey Sharybin
76ee9783a1 Improved cache management for movie clips from tomato branch
Replace pseudo-LRU approach of determining which buffer
to remove when running out of space allowed for cache
with approach which would remove the frame which is most
far away from newly added frame.

This is still a bit tricky because it's impossible to
distinguish which frame to delete in situation of:

        CCCC...CC
           ^

it's either user wants to extend left segment of cached
frames and buffers from right segment should be removed
or he wants to join this two segments and in that case
buffers from right segment should be removed.

Would need a bit more investigation which situation
is more common in general usecase.

Additional changes:

- Cleanup some memutil files (which are familiar to cache limiter)

- Add option to make moviecache verbose. If DEBUG_MESSAGES is
  defined in moviecache.c detailed logs would be printed to the
  console.

- Movie caches are now named which helps reading debug messages.
2012-07-10 14:43:50 +00:00
Sergey Sharybin
350518483d Code cleanup, typo fixes 2012-07-10 13:40:09 +00:00
Sergey Sharybin
0a4f8d0e7f Merging r48755 through r48793 from trunk into soc-2011-tomato 2012-07-10 10:11:54 +00:00
Campbell Barton
f807c2a04c rename raskter kdtree files to be less generic 2012-07-10 06:47:21 +00:00
Peter Larabell
bbbdcaa462 fix: inline to __inline in raskter.c for msvc 2012-07-10 05:16:43 +00:00
Peter Larabell
492d9aabe0 some code refactors in raskter.c to sync it with build where mask tiling is being developed. Also adds a bit more mask tiling code. 2012-07-10 04:51:08 +00:00
Campbell Barton
4563d1103d fix warnings/errors in recent raster commit. 2012-07-09 23:16:39 +00:00
Peter Larabell
689403bf57 updating raskter to support tiles compositor. this commit puts in some groundwork code to support tiles's pixel processor 2012-07-09 22:57:23 +00:00
Campbell Barton
c185635ed0 svn merge ^/trunk/blender -r48749:48754 2012-07-09 12:57:04 +00:00
Campbell Barton
facb1512c0 fix/workaround for cycles crash packing bvh
brecht - when you get time please look into this to see if the fix is ok.
2012-07-09 12:55:16 +00:00
Campbell Barton
cb72095090 svn merge ^/trunk/blender -r48729:48739 2012-07-08 18:21:51 +00:00
Campbell Barton
1bca7fe492 svn merge ^/trunk/blender -r48691:48729 2012-07-08 15:55:58 +00:00
Bastien Montagne
4c6abb8105 Fix for error from grumpy gcc in "over-warning" mode. Must explicitely cast uintptr_t to unsigned int (othe solution would be to use PRIuPTR macro from inttypes.h, but that would probably causes some problems with windows...). 2012-07-08 15:48:47 +00:00
Campbell Barton
76629c11ae correct use of __attribute__((nonnull)) 2012-07-08 15:11:13 +00:00
Campbell Barton
4bc818d240 code cleanup: quiet uninitialized memory use warning for X11 - harmless in this case but always gave warnings with memcheck (RGB color for alpha zero icon color wasnt initialized).
also some other minor changes.
2012-07-08 12:23:58 +00:00
Campbell Barton
b91bc4f037 use gcc attrubutes to warn on unused return values and arguments which shouldnt be NULL.
also remove IDP_AppendArray's return value which wasnt the new item in the array (which is odd/misleading), but wasnt used anywhere either.
2012-07-08 06:00:27 +00:00
Campbell Barton
1d29ee0d3b use alloc_size attribute for guarded alloc functions with gcc. 2012-07-08 03:15:37 +00:00
Campbell Barton
029611835e fix for crash when render result is NULL 2012-07-06 14:26:22 +00:00
Campbell Barton
f5fe447e00 svn merge ^/trunk/blender -r48638:48658 2012-07-05 18:04:17 +00:00
Campbell Barton
d8b86fd9b2 fix for error in own recebt commit, broke mask feathering. 2012-07-05 18:02:28 +00:00
Campbell Barton
3c367f924a svn merge ^/trunk/blender -r48604:48638 2012-07-05 11:40:48 +00:00
Sergey Sharybin
83758c4154 Color management: refactor of cache to deal better with movie clip cache
There were some crashes discovered in some circumstances of using
color management within the clip editor which ended up some refactoring
of color management cache.

Switch from global movie cache instance to per-image buffer instances

This only means keys for color managed buffers could be much simpier
and that look up would happen much faster in there're lots of frames
cached. Memory limiter stuff is still global for all color management
and in fact it's also shared with movie clip cache .

This allowed to get rid of original image buffer stored in cache
key and allowed to easily remove all display buffers when source
image buffer is being freed. This was main culptrit leading to
crashes.

Additional changes:

- Add option to make moviecache verbose. If DEBUG_MESSAGES is
  defined in moviecache.c detailed logs would be printed to the
  console.

- Movie caches are now named which helps reading debug messages.

- Improved a bit behavior of cache element removing when buffer
  overflows on adding new display buffer and there're frames from
  movie clip.
2012-07-05 09:41:00 +00:00
Nicholas Rishel
19011d44cf Doxygen cleanup 2012-07-05 04:47:47 +00:00
Campbell Barton
21bf13989f code cleanup: remove Python.h include from blenkernel. 2012-07-04 20:13:39 +00:00
Campbell Barton
6e97ecee00 fix for crash with zero area mask. 2012-07-04 18:49:09 +00:00
Campbell Barton
8054c3a78e style cleanup 2012-07-04 18:40:19 +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
715edceb42 spelling cleanup: metre -> er 2012-07-04 12:56:58 +00:00
Campbell Barton
fbc24a61c4 svn merge ^/trunk/blender -r48576:48585 2012-07-04 11:53:48 +00:00
Campbell Barton
16e6b7b867 cycles changes:
- images that can't be loaded because of the limit are printed in the console.
- textures that can't be found show up as pink (so we know somethings wrong).
2012-07-04 11:48:42 +00:00
Sergey Sharybin
1b556dcb51 Tomato: fixed crash caused by interaction between color management and
movie clip caches resulting in some unchecked NULL pointers.

Probably it'll be better to separate memory limitors for cache and
clips or double-check priority functions are fine to deal with
such cases.
2012-07-03 16:00:57 +00:00
Campbell Barton
259e78997a svn merge ^/trunk/blender -r48489:48527 2012-07-03 11:03:39 +00:00
Sergey Sharybin
1c00740b81 Tomato: style cleanup, no functional changes 2012-07-03 10:56:48 +00:00
Sergey Sharybin
5c70c29b9c Tomato: improved cache management for movie clips
Replace pseudo-LRU approach of determining which buffer
to remove when running out of space allowed for cache
with approach which would remove the frame which is most
far away from newly added frame.

This is still a bit tricky because it's impossible to
distinguish which frame to delete in situation of:

    CCCC...CC
        ^

it's either user wants to extend left segment of cached
frames and buffers from right segment should be removed
or he wants to join this two segments and in that case
buffers from right segment should be removed.

Would need a bit more investigation which situation
is more common in general usecase.
2012-07-03 10:56:33 +00:00
Campbell Barton
ff9a4e445e fix for smoke writing uninitialized values to pointcache, not a big deal since they are ignored on reading. 2012-07-03 06:45:43 +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
Daniel Genrich
a0c6371b7f Smoke Bugfix: Turbulence was removed. 2012-07-02 13:41:51 +00:00
Daniel Genrich
9f7af5ef7e Bugfix for wrong / bad vorticity forming weird banding on the y and z axis.
Part of Blender Smoke Develeopment Milestone III.
2012-07-02 12:55:23 +00:00
Campbell Barton
5a803b7edf svn merge ^/trunk/blender -r48415:48469 2012-07-01 15:39:02 +00:00
Campbell Barton
1597ad9377 style cleanup 2012-07-01 09:54:44 +00:00
Campbell Barton
8b865c01cd style cleanup: comments 2012-06-30 22:49:33 +00:00
Sergey Sharybin
34a034fb1b Code style cleanup and prevent crashes when OCIO configuration file is not found 2012-06-30 14:53:58 +00:00
Sergey Sharybin
b57a5521c4 Color management refactoiring and some extra options
- Move space-being settings (such as view transform) into own
  DNA and RNA structure to avoid code duplication in some areas
  and save some arguments on display buffer acquiring function.

  Also added some utility functions to BKE to manipulate this
  settings.

- Replace static sized color managed buffer flags array with
  dynamically sized array which matches actual number of displays.

  Probably this flags better be transfposed so it'll support
  any number of view transforms and 32 displays (currently it's
  other way around). it's runtime flags only, so would be simple
  to change any time.

- Added support of configurable exposure and gamma.

  Changing this settings wouldn't generate new item in cache,
  it'll affect on buffer with the same color spaces conversion.

  It'll also run full color transform from scratch on every run,
  this could be changes in a way that it'll re-use color managed
  buffer, but from quick glance it doesn't give really noticeable
  boost.

  Currently this settings are stored as pointer in ImBuf structure
  itself. Probably it make sense removing them from ImBuf and make
  moviecache be able to store some kind of tags associated with
  cached ImBuf.
2012-06-30 12:37:16 +00:00