Commit Graph

476 Commits

Author SHA1 Message Date
Monique Dewanchand
e8e8ceaea2 fix for Tiles bug - opencl:
[#31981] Bokeh Blur Node - Size input socket does not accept input from Value Input node, Values smaller than 0.1 will produce black output
2012-07-10 20:33:24 +00:00
Monique Dewanchand
8a4584d04d Fix for tiles bug:
[#31981] Bokeh Blur Node - Size input socket does not accept input from Value Input node, Values smaller than 0.1 will produce black output
2012-07-10 20:21:13 +00:00
Sergey Sharybin
ba8154e24a Keying screen: small fixes and improvements from tomato
- Fixed issues with calculating matte with balance != 0.5
  It used to be used concave combination of minimal and maximal
  channel values which could be inpredictable.
  Use concave combination of two non-major channels sorted
  by their index, so such combination would always use the same
  coefficients for particular non-major channels.

- Added despill balance slider which defines balance between
  non-major channels used for calculating average of two
  colors. Difference between average value and pixel value of
  major screen channel defines amount of despill. Balance of
  0.5 gives the same behavior as it was before this slider
  was added.

---
svn merge -r48678:48679 -r48789:48790 ^/branches/soc-2011-tomato
2012-07-10 14:53:36 +00:00
Sergey Sharybin
a41dc719bf Movie Clip Node: skip putting frame to cache when rendering animation
This helps keeping memory usage low and have cached segments untouched
when mixing stuff like tracking and rendering -- now you wouldn't be
need to re-cache segment you're working on after rendering.

---
svn merge -r48550:48552 ^/branches/soc-2011-tomato
2012-07-10 14:42:37 +00:00
Sergey Sharybin
2de2b7eba8 Synchronize style cleanup changes made in tomato branch 2012-07-10 13:41:21 +00:00
Sergey Sharybin
165e8b0155 Fix compilation error when using MSVC 2012-07-10 12:57:09 +00:00
Sergey Sharybin
1360147e9e Tag ununsed variable and make function real explicit prototype. 2012-07-10 12:42:03 +00:00
Jeroen Bakker
dc65a26bf6 refactor node highlight code. New implementation will not write to
uninitialized memory. it happened when you delete a node that was being
executed. in the compostor
2012-07-10 12:23:49 +00:00
Sergey Sharybin
5cc0e5f751 Mango request: added an input node to use track's position in compositor
--
svn merge -r48088:48089 -r48091:48092 ^/branches/soc-2011-tomato
2012-07-10 11:01:25 +00:00
Sergey Sharybin
5b57f38fb5 Mango request: option to clamp result of Mix RGB and Color Math nodes
---
Merging r48792 from soc-2011-tomato into trunk
2012-07-10 10:36:18 +00:00
Sergey Sharybin
717ac64cb1 Tomato: added option to clamp result of Mix RGB and Color Math nodes 2012-07-10 09:12:33 +00:00
Jeroen Bakker
e343f7f320 Inline the read Memory Buffer functions for speed optimizations. 2012-07-10 06:31:16 +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
Jeroen Bakker
bfe776cd1d removed depth aware defocus
add blur to radius buffer
2012-07-09 15:21:43 +00:00
Campbell Barton
1bca7fe492 svn merge ^/trunk/blender -r48691:48729 2012-07-08 15:55:58 +00:00
Jeroen Bakker
45aeee6a34 Multi device OpenCL did not work.
case was that cached kernels were used by both devices in separate
threads.

removed the cached kernels.
2012-07-08 13:03:09 +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
ec233cd747 svn merge ^/trunk/blender -r48674:48681 2012-07-06 14:25:49 +00:00
Sergey Sharybin
d1c335ad79 Tomato keying screen: small fixes and improvements
- Fixed issues with calculating matte with balance != 0.5
  It used to be used concave combination of minimal and maximal
  channel values which could be inpredictable.
  Use concave combination of two non-major channels sorted
  by their index, so such combination would always use the same
  coefficients for particular non-major channels.

- Added despill balance slider which defines balance between
  non-major channels used for calculating average of two
  colors. Difference between average value and pixel value of
  major screen channel defines amount of despill. Balance of
  0.5 gives the same behavior as it was before this slider
  was added.
2012-07-06 12:59:00 +00:00
Jeroen Bakker
28f7bfa8df * Added OpenCL implementation of the Defocus node
* Always disable two phase compositing during rendering

 - At Mind -
2012-07-06 11:31:40 +00:00
Campbell Barton
cf369c5e13 svn merge ^/trunk/blender -r48658:48674 2012-07-06 09:24:47 +00:00
Jason Wilkins
3e073f42a5 You do not need to create an object to call a static function. 2012-07-05 20:44:42 +00:00
Campbell Barton
3c367f924a svn merge ^/trunk/blender -r48604:48638 2012-07-05 11:40:48 +00:00
Jeroen Bakker
e5e1d7bc9f Added a default margin to the tile dependancy of the lens distortion
node.
2012-07-05 09:39:06 +00:00
Jeroen Bakker
5e0f7467e9 Adjusted margin of the lens distortion 2012-07-05 08:33:17 +00:00
Jeroen Bakker
4e836ab476 Moved highlight code to the workscheduler. 2012-07-05 06:34:31 +00:00
Antony Riakiotakis
3818a47e4a Change order of inclusion to stop MinGW from complaining 2012-07-04 22:55:40 +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
Jeroen Bakker
7cde835c2e relay the original node to a different place holder to resolve some
crashes.
2012-07-04 12:30:17 +00:00
Bastien Montagne
4d2a6a8e21 Spellfixes: colour -> color 2012-07-04 12:19:50 +00:00
Campbell Barton
fbc24a61c4 svn merge ^/trunk/blender -r48576:48585 2012-07-04 11:53:48 +00:00
Jeroen Bakker
778999cbbf Two pass execution:
1. first pass only fast nodes are calculated and only to the active
viewer node
2. second pass all nodes to all outputs

Temp disabled highlights because of random crashes.
2012-07-04 11:39:28 +00:00
Jeroen Bakker
33e12a2983 Highlight nodes that are being processed 2012-07-04 10:01:45 +00:00
Sergey Sharybin
17d7a9c3d9 Merging r48545 through r48574 from trunk into soc-2011-tomato 2012-07-04 07:33:34 +00:00
Sergey Sharybin
facc2429ab Mask node: create a copy of layers to be rasterized in initExecution
This creates a list of splines to be rasterized in nitExecution which
is being called from main thread. This should resolve possible threading
issues discovered in tomato branch.
2012-07-04 07:10:23 +00:00
Sergey Sharybin
9ac9040cfd Tomato: skip cache for Movieclip input node only when rendering 2012-07-03 16:23:15 +00:00
Sergey Sharybin
f56f492c5a Tomato experimental option: disable cacheing for movie clip node 2012-07-03 16:18:39 +00:00
Campbell Barton
259e78997a svn merge ^/trunk/blender -r48489:48527 2012-07-03 11:03:39 +00:00
Jeroen Bakker
2f5735a9d4 Optimized the area of interest of the lensdistortion node.
This will have faster feedback to the user, as lensdistortion is mostly
a node that is located at the end of a composite
2012-07-03 09:05:19 +00:00
Jeroen Bakker
ea5e0d0212 Limit out of screen tiles to be scheduled. 2012-07-02 15:26:47 +00:00
Campbell Barton
5a803b7edf svn merge ^/trunk/blender -r48415:48469 2012-07-01 15:39:02 +00:00
Sergey Sharybin
148fdb3a7a Color management: fixed crash when freeing context for inactive viewer node 2012-07-01 14:54:05 +00:00
Campbell Barton
8b865c01cd style cleanup: comments 2012-06-30 22:49:33 +00:00
Sergey Sharybin
d0f67e498e Color management fixes and improvements
- Made color management cache safe for situations when one area
  requested a display buffer, then some changes were done which
  invalidated cache, other area requested display buffer which
  changed cached buffer.

  Suck case could be fatal for first used of display buffer,
  which didn't happen yet because cache is being accessed from
  main thread only, but better to keep this things completely
  thread save to avoid headache in the future.

- Baked RRT transformations, which gives ~3-4 times boost
  hopefully without visible artifacts.

- Added support of partial updates to display buffers.

  This would create special context which hols display buffer
  which imbuf had to the time of creating this context and
  later this context would allow to run a color correction
  from given linear buffer within given region.

  This is being used by compositor to enable more realtime
  display update when compositing.

- Added support of color management backdrop for nodes editor.

  There's now special menu called display properties in N-panel
  of nodes editor.

  Probably this better be de-duplicated somehow, but not sure
  yet how. Currently it's not so harmful to have panel for two
  spaces which contains only 2 properties.

  There's currently one unsolved issue with backdrop:
  it's not being updated progressively when just loading the
  file -- it's simply because there's no color managed display
  buffer for backdrop yet, and compositor doesn't actually
  know which color space to use here to generate preview to.
2012-06-30 12:36:03 +00:00
Campbell Barton
5a8b3dc1f9 add NULL check for ibuf, was crashing while rendering randomly 2012-06-28 17:26:21 +00:00
Campbell Barton
420150f752 svn merge ^/trunk/blender -r48370:48375 2012-06-28 14:19:53 +00:00
Campbell Barton
c8c743b609 code cleanup: compile with clang and quiet some warnings. 2012-06-28 12:32:06 +00:00