Commit Graph

349 Commits

Author SHA1 Message Date
Sergey Sharybin
c60eabda92 Merging r49386 through r49389 from trunk into soc-2011-tomato 2012-07-30 09:47:39 +00:00
Sergey Sharybin
585bc327e2 Fix incorrect connections for muted nodes in tile compositor
Not tile compositor would use the same routines to detect which
links to add for muted node.
2012-07-30 09:46:14 +00:00
Campbell Barton
4b4395213e inpaint - gain some speed by not doing X/Y clamping in inner loops.
add assert() so we can ensure its not happening still.
2012-07-29 19:36:09 +00:00
Campbell Barton
953423e1ed - fix incorrect array delete use.
- replace 1.0f / sqrt(2) with M_SQRT1_2 define.
- use mini rather then MIN2.
2012-07-29 19:11:00 +00:00
Campbell Barton
595156fd73 style cleanup: use this->m_* for private members. 2012-07-29 19:02:23 +00:00
Campbell Barton
b9fb8edddd style cleanup 2012-07-29 18:53:47 +00:00
Campbell Barton
a14fc54702 svn merge ^/trunk/blender -r49333:49361 2012-07-29 18:48:34 +00:00
Campbell Barton
7217927414 add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these). 2012-07-29 18:14:20 +00:00
Campbell Barton
c41e1e434a code cleanup: replace MIN2/MAX2 with minf/maxf 2012-07-29 16:59:51 +00:00
Peter Schlaile
b6288e94eb == compositor ==
This adds an inpaint node to blender.

In case, you don't know, inpainting does this:
http://en.wikipedia.org/wiki/Inpainting

It's use cases in blender are 

* wire removal
* green screen background reconstruction

The node isn't tile based (for fundamental reasons), but very fast,
since it first builds a manhatten distance map and after that performs
color convolution only on the edges.

That's something, one should probably add also to the dilate node (in
step mode) to make it perform a lot better for dilate iterations greater
than 3.

It will bring it's computing time from O(n^3) down to O(n^2).
Take a look here for the details: 
http://ostermiller.org/dilate_and_erode.html )
2012-07-29 15:48:38 +00:00
Jeroen Bakker
93ff6f6dff Support for depth buffers in compositor and viewer node
Support for only alpha images in compositor and viewer node
2012-07-29 15:06:50 +00:00
Sergey Sharybin
e6d80e5848 Merging r49300 through r49333 from trunk into soc-2011-tomato 2012-07-28 18:42:54 +00:00
Campbell Barton
f1acd6ac3e code cleanup: pass mouse position as int[2] rather then wmEvent 2012-07-27 15:15:55 +00:00
Sergey Sharybin
a63ffa9ae3 Merging r49281 through r49286 from trunk into soc-2011-tomato 2012-07-27 11:07:55 +00:00
Sergey Sharybin
18e874798d Track input node: more control on over output value
Now supports output value of:

- Absolute marker position
- Marker position relative to the very first marker
- Marker position relative to given scene frame
2012-07-27 11:07:12 +00:00
Sergey Sharybin
d0b387a0df Track input node: move all initializaiton to initExecution function 2012-07-27 11:07:09 +00:00
Campbell Barton
fc0bf22186 svn merge ^/trunk/blender -r49263:49280 2012-07-27 10:27:28 +00:00
Campbell Barton
b8d96bc011 mask motion blur shutter option 2012-07-27 10:20:36 +00:00
Campbell Barton
b10a35a9a9 motion blur for mask node:
TODO
- add shutter speed option
- add blur option
2012-07-27 09:32:47 +00:00
Sergey Sharybin
f6b542aeb2 Merging r49261 through r49263 from trunk into soc-2011-tomato 2012-07-26 18:05:42 +00:00
Sergey Sharybin
85571c339d Fix unworkable track position node 2012-07-26 18:05:05 +00:00
Campbell Barton
e27f56d388 svn merge ^/trunk/blender -r49244:49250 2012-07-26 13:30:37 +00:00
Campbell Barton
733edf8628 option to use manual size input for scene 2012-07-26 13:29:38 +00:00
Sergey Sharybin
0051d24b23 Merging r49191 through r49211 from trunk into soc-2011-tomato 2012-07-25 15:07:47 +00:00
Jeroen Bakker
8df10a4018 Defocus node.
added some maxblur optimizations. Per tile the max blur is calcualted,
will save some unneeded CPU/GPU loops
GPU: 1:09 => 0:21
CPU: 1:50 => 0:35
2012-07-25 10:46:19 +00:00
Sergey Sharybin
a0403fe2fb Merging r49149 through r49167 from trunk into soc-2011-tomato 2012-07-24 09:03:40 +00:00
Sergey Sharybin
d1db16b5d3 Fix corrupted frames producing by fog glare node
Seems to be simple non-initialized buffer used in math, but additional
check would be welcome here.

At least now result doesn't seems to be corrupted and seems to behaving
the same way as non-tile compositor.
2012-07-24 09:00:58 +00:00
Sergey Sharybin
8569262f3c Merging r49146 through r49148 from trunk into soc-2011-tomato 2012-07-23 18:28:00 +00:00
Sergey Sharybin
4c22d38f92 Keying: apply garbage / core mattes after clamping
Applying this mattes before clamping produced ugly outline around
matte boundaries.
2012-07-23 18:27:06 +00:00
Campbell Barton
919a848015 svn merge ^/trunk/blender -r49107:49118 2012-07-22 16:10:06 +00:00
Campbell Barton
dae8e9fbb2 fix for own error using uninitialized memory for scale compo node. 2012-07-22 15:49:20 +00:00
Campbell Barton
e646803441 fix for more new[]/delete[] mismatches 2012-07-22 15:31:12 +00:00
Campbell Barton
f9ed34cce9 fix for compositor new[]/delete[] mismatch. 2012-07-22 15:15:39 +00:00
Campbell Barton
9b51503307 style cleanup 2012-07-21 22:58:08 +00:00
Sergey Sharybin
7271f8e38f Color management: threading fixes and partial buffer update refactor
There used to be an issue in colormanage_cache_get which lead to
wrong reference number counter in cases when exposure / gamma
does not match values stored in cache. In this case cache handle
should be set to NULL, no callee function could always call
buffer release function (as it was intended to).

Made display buffer acquire / release functions thread safe.
This applies to "external" API only, internal helpers are
non-thread safe for performance issues, so if one uses them
he need to be careful.

Converted partial display buffer update into a single function
which still updates all display buffer ever created for given
image buffer. This means that it's not needed to create any
kind of context first and if there're display buffers created
in-between of partial updates they would also be updated with
next calls of partial updates.

This allowed to make render result nicely color managed during
rendering, meaning that render progress is visualisable with
color management for image editor set up.
2012-07-20 14:16:25 +00:00
Campbell Barton
10f14fb181 svn merge ^/trunk/blender -r49067:49082 2012-07-20 14:02:51 +00:00
Campbell Barton
80a24a2ff5 fix for compositor bug, mix node operation clamp was uninitialized.
made HSV node randomly clamp values from 0-1.
2012-07-20 14:01:43 +00:00
Jeroen Bakker
579a4a02a5 Possible fix for [#32141] Crash when using a mask as the factor input
for a color combine (mix) node with render resolution at 100%

Seems to be that the MaskNode has been created as a complex node. But no
complex features were used. Converted the execute pixel to simple
execution. And it sees that the crash does not happen.

Not sure if it is the issue is solved. I am going to let the user retest
with this revision.
2012-07-19 17:28:37 +00:00
Campbell Barton
99c97e5aa3 svn merge ^/trunk/blender -r49061:49063 2012-07-19 11:35:45 +00:00
Jeroen Bakker
a56f4fee38 Fix for
* [#32040] size-input of a blur-node is uniform for the whole picture
 * [#32062] Blur node Size input is not working with 
 * [#32140] Blur Node using a greyscale input as size multiplier fails
to work

Node now has a new option (new compositor cannot detect if the connected
part is a single value, or an image connected).

With this option the use of a reference image to multiply the size of
the blur per pixel can be enabled/disabled.

Regards, 
Jeroen
 - At Mind -
2012-07-19 11:05:18 +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
Campbell Barton
9d79d2bee8 svn merge ^/trunk/blender -r49029:49035 2012-07-18 16:26:07 +00:00
Campbell Barton
c8029bffd9 workaround for a bug with zero edges getting removed got feather faces out of sync and crashed 2012-07-18 16:24:13 +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
Sergey Sharybin
4907f7c7e8 Merging r48954 through r48961 from trunk into soc-2011-tomato 2012-07-16 11:06:26 +00:00
Campbell Barton
a2e2489f61 correct own naming error BLI -> BKE 2012-07-16 08:53:11 +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