Commit Graph

492 Commits

Author SHA1 Message Date
Sergey Sharybin
440ef7356a Two threading issues:
- Drawing masks in image editor requires LOCK_DRAW_IMAGE around
  ED_space_image_get* functions since they'll acquire image buffer.

  Lock is needed because viewers will be modified directly in
  compositor (see commend in draw_image_main)

- Seems that was wrong order of invalidating render result and
  viewer image invalidation happened in Composite node, which
  could easily lead to thread lock.
2013-01-15 07:56:38 +00:00
Campbell Barton
e24443b79a style cleanup 2013-01-09 03:30:15 +00:00
Sergey Sharybin
1dd8851244 Fix #33804: Blender crash unlinking multilayer exr image in image node 2013-01-08 08:39:28 +00:00
Brecht Van Lommel
c2dfcd9208 Convert alpha node: rename "key alpha" to "straight alpha" for consistency. 2012-12-28 14:46:32 +00:00
Sergey Sharybin
8ac1d8a4ea Fix #33650: Compositor locks up when input is an unrendered render layer.
Issue was caused by resolution detecting which assumed zero resolution is
undefined one and should be re-evaluated. It doesn't work in cases when
there's a missing input, causing lots of unneeded resolution re-calculation.

It wasn't so much issue in average sized node trees, but it was a real
problem in generated tree from the report.

Currently used pretty simple solution which added a boolean flag to the
node operation which signal whether resolution was ever set or not.

There're probably smarter solutions here but can not think about them.
2012-12-24 13:33:47 +00:00
Sergey Sharybin
851cb9b345 Added support of J2K codec for Jpeg2000 writing
This codec is absolutely needed to generate DCP using OpenDCP,
before that external application to convert JP2 to J2K was used
which slowed down export a lot.

New codec is exposed to image format settings panel and called
Codec. Default one is JP2 which creates files with .jp2 extension,
new one is called J2K which creates with .j2c extension.

Other changes:
- Fixed avi jpeg warning which was treating as error here.
- Made it so extension is detecting from ImageFormatData instead
  of image file type, which makes it possible to have different
  extension for the same file type depending on it's settings.

  IRIS format should still be changed (depending on number of
  channels it'll be .bw, .rgb or .rgba extension)

- Default image format settings would be set from image buffer
  when re-saving it. Makes it possible to easily open .j2c file
  and save it using J2K codec (without this change it'll save as
  .jp2 using JP2 codec)
2012-12-23 13:57:09 +00:00
Campbell Barton
806720507e style cleanup: wrap long lines (>200) 2012-12-23 01:18:35 +00:00
Campbell Barton
f25618f29a make Node.links return a tuple, this may you can't do socket.links.append() by mistake.
removed RNAMeta mixin class since you cant register subclasses.

also some minor code cleanup
2012-12-21 12:16:13 +00:00
Campbell Barton
b2c66e268f replace MIN/MAX 3,4 with inline functions 2012-12-21 05:07:26 +00:00
Campbell Barton
899ba3fdb6 style cleanup 2012-12-18 01:46:15 +00:00
Bastien Montagne
ab2c273b12 Added GPL header to sconscripts!
Also changed shebang to '#!/usr/bin/env python', this is more portable across unixes...
2012-12-17 08:01:43 +00:00
Campbell Barton
5943c81a93 code cleanup: neareast -> nearest 2012-12-11 14:19:41 +00:00
Sergey Sharybin
4742dc3fd7 Fix for crop operation using uninitialized bounds in cases input image resolution is zero. 2012-12-05 14:27:51 +00:00
Sergey Sharybin
89d91f5a7d Fix #33402: Compositor crashes when drag-dropping multilayer exr
There was a missing image reload signal in node creation by drag-dropping,
which lead to incorrectly set image type.

Also fixed misusage of IMB_freeImBuf used to release buffer acquired by
BKE_image_acquire_ibuf.
2012-12-04 08:10:53 +00:00
Bastien Montagne
818a345be3 Silent a bunch of gcc warnings (usually dummy, but noisy!). 2012-12-02 16:01:06 +00:00
Campbell Barton
ee08c27f95 fix [#33368] Crash with multilayer exr node 2012-12-01 08:47:39 +00:00
Sergey Sharybin
7fa7ce297e Map Range: added the same infinity clamping for Z buffer as normalize node.
Think should be pretty much harmless since if this node was used for buffers
with infinities it already showed artifacts. Now it should be more useful for
mapping Z buffers.
2012-11-30 13:17:19 +00:00
Sergey Sharybin
4f8f5746a8 Normalize node: clamp infinities to 0/1 (depending on sign)
The same behavior was in old compositor system and it makes more sense
when you're normalizing Z buffer.
2012-11-30 12:48:30 +00:00
Sergey Sharybin
1db677a51c Final render wouldn't set compositor's update_draw callback, so added NULL check
Seems no extra notifiers should be added here.
2012-11-30 11:26:57 +00:00
Sergey Sharybin
323e86694e Compositor should never add notifiers by himself, notifiers should be added
from main thread using job update callback.

Added new execution-time callback to bNodeTree which marks job to be updated.

The code here could be a bit not so obvious because in some cases job update
callback need to merge local tree, but it's only needed for old compositor
system which is gonna to be removed soon, so decided not to bother with
cleanup now. Removing old compositor system will also allow to drop stats_draw
callback from bNodeTree.

This should fix following bugs:
2012-11-30 09:12:10 +00:00
Campbell Barton
0b9be70591 typo's and some style cleanup, also added asserts into BLI_vsnprintf and BLI_sprintfN when invalid args are given. 2012-11-28 06:43:04 +00:00
Campbell Barton
7ef78723b7 code cleanup: doxy comment corrections and correct own typo animation player docs. 2012-11-26 00:59:11 +00:00
Sergey Sharybin
c8767b514d m_overlay wasn't initialized in a constructor of FastGaussianBlurValueOperation 2012-11-23 12:54:44 +00:00
Sergey Sharybin
587067b4fc Fix usage of uninialized memory in some operations
- FastGaussianBlurValueOperation is a value operation, so use only first vector
  component in initializeTileData.

- Gamma correct/uncorrect operations didn't set alpha for output which lead to
  usage of uninitialzied memory further in nodes graph.
2012-11-23 12:50:59 +00:00
Lukas Toenne
130c60efa0 Compositor: Disabled debug assert checks for connected input sockets after convertToOperations. This breaks quite a lot and is not really necessary, since connected Node inputs are ignored later on. Connected outputs however are still forbidden, this indicates a real bug. 2012-11-23 12:39:49 +00:00
Lukas Toenne
d73633e537 When the File Output node exits early in convertToOperations (in case not rendering), it should still unlink all inputs to avoid debug assert failure that checks for remaining Node connections (debug_check_node_connections). 2012-11-21 10:09:51 +00:00
Lukas Toenne
e6449a5c2c Fix for debug assert failure with Reroute nodes in compositor. After redirecting links from the reroute output the input must be completely unlinked, otherwise the debug_check_node_connections will complain (this is a sanity check that ensures all the original Nodes have been fully reconnected to Operations). 2012-11-21 09:32:40 +00:00
Brecht Van Lommel
469324b049 Fix compositing normal node not properly showing vector XYZ values when opening
socket menu, and make the normal animatable.
2012-11-17 16:11:02 +00:00
Sergey Sharybin
0071ce5022 Fix #33209: Opening an image with image node on Compositing freezes Blender
Own mistake in image threading commit.
2012-11-17 11:07:46 +00:00
Sergey Sharybin
c063194c6a Fix #33204: Blur node ignores Gamma setting
Gamma correction option was ignored by new compositor system.
Also new compositor was doing alpha premul in a wrong way. In fact,
not sure if it should do premul -- old compositor didn't do that..
2012-11-17 06:14:25 +00:00
Campbell Barton
e2fe7751d6 code cleanup: replace most DO_MINMAX2 -> minmax_v2v2_v2
also add UNPACK macros's. handy for printing vectors for eg.
2012-11-15 22:20:18 +00:00
Sergey Sharybin
5c6f6301b0 Image thread safe improvements
This commit makes BKE_image_acquire_ibuf referencing result, which means once
some area requested for image buffer, it'll be guaranteed this buffer wouldn't
be freed by image signal.

To de-reference buffer BKE_image_release_ibuf should now always be used.

To make referencing working correct we can not rely on result of
image_get_ibuf_threadsafe called outside from thread lock. This is so because
we need to guarantee getting image buffer from list of loaded buffers and it's
referencing happens atomic. Without lock here it is possible that between call
of image_get_ibuf_threadsafe and referencing the buffer IMA_SIGNAL_FREE would
be called. Image signal handling too is blocking now to prevent such a
situation.

Threads are locking by spinlock, which are faster than mutexes. There were some
slowdown reports in the past about render slowdown when using OSX on Xeon CPU.
It shouldn't happen with spin locks, but more tests on different hardware would
be really welcome. So far can not see speed regressions on own computers.

This commit also removes BKE_image_get_ibuf, because it was not so intuitive
when get_ibuf and acquire_ibuf should be used.

Thanks to Ton and Brecht for discussion/review :)
2012-11-15 15:59:58 +00:00
Campbell Barton
283ee53085 fix for deleting lines hanging the text editor when no markers are used, presence of markers still hangs.
also compiler warnings and some style edits.
2012-11-15 02:11:40 +00:00
Dalai Felinto
42db4fb50a fix range map node clipping when max < min
(useful for flipping the values inside the node)
2012-11-14 22:15:45 +00:00
Dalai Felinto
7cfb79256e Map Range Node (tiles)
this node allows for more control for normalization of the mapped input range.

Made during BlenderPRO 2012 - Brasilia, Brazil :)
Idea and testing: Daniel Salazar
Implementation: yours truly
Reviewed by Lukas Toenne and Sergey Sharybin
2012-11-14 19:53:46 +00:00
Campbell Barton
cf6994b910 code cleanup: spelling,
also initialize bmesh-bevel settings struct to zero to avoid possible uninitialized memory later.
2012-11-12 07:33:01 +00:00
Sergey Sharybin
92c8c2ed69 Code de-duplication in imageprocess.c -- made it use interpolation functions from blenlib 2012-11-11 08:48:35 +00:00
Sergey Sharybin
446f70f286 Removed determineDependingAreaOfInterest from movie distortion node
It wasn't used and it was incorrect anyway (distortion could be more than 100px).
2012-11-10 19:15:09 +00:00
Sergey Sharybin
f81e30a41f Solved issue with distorted compositor results in some cases
Originally issue was discovered when using stabilization and movie distortion
nodes, but in fact issue was caused by render layer node always doing nearest
interpolation. Now made it so this node will respect sampler passed to it's
executePixel function and do an interpolation.

Added two new functions to do bilinear/bicubic interpolation in float buffer
with variable number of components per element, so it could interpolate 1, 3
and 4 component vectors. This functions currently mostly duplicates the same
functions from imageprocess.c and it should actually be de-duplicated. Think
it's ok to leave a bit of time with such duplication, since functions should
be generalized one more time to support byte buffers, which could backfire on
readability.

Also removed mark as complex from stabilization node, which isn't needed sine
int fact this node is not complex.
2012-11-10 19:11:25 +00:00
Sergey Sharybin
819ca0accc Fixes for movie distortion node
- Somehow this node was using nearest interpolation which seems have been
  passed from compositor node. It was using b-spline interpolation with
  old compositor implementation. Now forced this node to use bilinear
  interpolation, which should be close enough.

- Operation should be marked as complex it seems, otherwise area of
  interest wouldn't make any affect on it's behavior.
2012-11-10 04:59:32 +00:00
Campbell Barton
2bb174cfa4 style cleanup: indentation 2012-11-09 09:33:28 +00:00
Sergey Sharybin
1c450d71ef Fixed crashes when motion tracks are zero-sized
This is probably versioning issue happened when both trunk and tomato
were mixed to work on the same file.

Anyway, there're few files here locally and it's probably other users
do have the same files, so lets keep things safe here :)
2012-11-07 11:18:42 +00:00
Campbell Barton
e76b99e7b0 fix own error in r51819, was reading outside of the buffer, also comment unused vars. 2012-11-04 14:46:20 +00:00
Campbell Barton
7579a9ec37 code cleanup: double promotions 2012-11-04 10:20:16 +00:00
Campbell Barton
25591e958d style cleanup: tabs & whitespace 2012-11-03 15:35:03 +00:00
Campbell Barton
6e17d1a5e0 fix for compositor regression where blur note offset the image one pixel to the top right. 2012-11-02 12:44:09 +00:00
Lukas Toenne
17934e1803 Fix for Hue/Sat/Val compositor node. This was using the wrong input socket for the color constant (Fac instead Image). 2012-11-01 17:05:01 +00:00
Campbell Barton
f213ae0b19 style cleanup 2012-11-01 09:54:00 +00:00
Lukas Toenne
36127e1255 Added compositor graph functions for removing socket connections explicitly in convertToOperations. The InputSocket->unlink function should only be used in combination with relinkConnectionsDuplicate, in which case the original node connection will still exist. This would trigger an assert failure, so the original connection should be removed. Only node using this atm is the channel separation node, but will be needed for future group nodes too. 2012-10-29 14:04:51 +00:00
Campbell Barton
0c6a0b293f style cleanup 2012-10-28 15:23:16 +00:00