Commit Graph

34035 Commits

Author SHA1 Message Date
Sergey Sharybin
8cc17be274 Merging r50450 through r50454 from trunk into soc-2011-tomato 2012-09-06 16:06:55 +00:00
Sergey Sharybin
0b778a9026 Merging r50423 through r50449 from trunk into soc-2011-tomato 2012-09-06 09:44:32 +00:00
Sergey Sharybin
bac6f03e16 Color Management: fix for dereferencing NULL pointer 2012-09-05 16:29:16 +00:00
Sergey Sharybin
4d152140a3 Color Management: exposure is in fact pre-display transfrom 2012-09-05 16:24:33 +00:00
Sergey Sharybin
ee5bf889e9 Color Management: RGB curves transform as a part of display transform
This replaces per-image editor curve mapping which didn't behave properly
(it was possible to open the same image in two image editors and setup
different curves in this editors, but only last changed curve was applied
on image)

After discussion with Brecht decided to have something which works reliable
and predictable and ended up with adding RGB curves as a part of display
transform, which is applied before OCIO processor (to match old behavior).

Setting white/black values from image editor (Ctrl/Shift + LMB) would
affect on scene settings.

This could break compatibility, but there's no reliable way to convert
old semi-working settings into new one.
2012-09-05 16:08:36 +00:00
Sergey Sharybin
7d980ca969 Color Management: don't show input color space for byte images 2012-09-05 14:29:15 +00:00
Sergey Sharybin
16a126622e Merging r50413 through r50422 from trunk into soc-2011-tomato 2012-09-05 14:19:40 +00:00
Sergey Sharybin
196028a99f Color Management: made OpenColorIO transformations aware of color unpremultiply
Mainly behaves in the same way as legacy color transformation, but it'll
give different result on over and under exposured areas.

Not sure if it's indeed issue -- seems this behaves crappy in both of
current stable release and OCIO branch.
2012-09-05 13:58:01 +00:00
Sergey Sharybin
ade9acca41 Color Management: fix for tiled image draw and remove unused code 2012-09-05 12:14:09 +00:00
Sergey Sharybin
201583592f Code cleanup -- remove unneeded changes, synchronize some areas with trunk 2012-09-05 12:00:08 +00:00
Sergey Sharybin
c6599979c7 Sequencer: multi-threaded histogram calculation
This gives some percentage of speedup, which compensates slowdown
caused by converting image buffer into display space.

Used OpenMP for this. Still feel skeptic about this, discussed with
Brecht and we decided this approach actually could be used since
seems all the platforms has got OpenMP issues solved.

Waveform and vector scopes are still single-threaded since they're
a bit tricker to be done multi-threaded and probably not so commonly
used.
2012-09-05 11:43:11 +00:00
Sergey Sharybin
54cf098492 Sequencer: cache currently displaying scopes
This avoids calculation of scopes on every redraw, so such tools as panning
and zoom wouldn't imply re-calculating scopes.

Implemented as a structure inside of SpaceSeq, juts like it's done for clip
and image spaces.

Also fixed zebra display to work in display space.
2012-09-05 11:43:05 +00:00
Sergey Sharybin
f4817e316e Color Management: sequencer's scopes now works in display space
Added utility function to apply display transformation on image buffer's
float array which is currently only used by sequencer's scopes.

This function is multithreaded, but scopes should be improved further
since currently they're being recalculated from scratch on every draw.
2012-09-05 11:42:57 +00:00
Sergey Sharybin
3963425006 Merging r50374 through r50412 from trunk into soc-2011-tomato 2012-09-05 11:42:20 +00:00
Sergey Sharybin
8dff07ef9a Color Management: fix for color sample information line
- Color managed RGB values wouldn't be displayed anymore for
  byte images (which are currently unsupported to be managed).

- Color rectangle would now be color managed

- Sequencer was passing non-linear float to information line,
  now it'll pass linear float.
2012-09-04 12:32:32 +00:00
Sergey Sharybin
1508f62169 Color Management: fix for view/display settings validation
It was a misusage of LinkData and actual data leading to wrong
string comparsion and possible wrong memory access.
2012-09-04 12:32:18 +00:00
Sergey Sharybin
3b9c3604c6 Color Management: remove hardcoded ACES ODT tonemap
This tonemap was added as a temporary option only and if it'll be
needed again, it'll be better to implement is as either a spline
in OCIO or as a film response curve (as some of such curves were
added as a presets for RGB curves in Mango production SVN).

Also revert changes made to IMB_buffer_byte_from_float since it's
not actually needed anymore and makes it's clearer changes against
trunk.
2012-09-04 12:32:12 +00:00
Sergey Sharybin
e15f352831 Merging r50265 through r50373 from trunk into soc-2011-tomato 2012-09-04 09:06:37 +00:00
Sergey Sharybin
86ff6cc346 Color Management: fix compilation error when OCIO is disabled 2012-09-03 10:08:55 +00:00
Thomas Dinges
6acb586c95 Cycles / Brick Texture:
* Added GLSL stub for the Brick texture, fixes an error in the console when switching to Material Shading in the 3D View.
2012-08-30 20:45:01 +00:00
Sergey Sharybin
70301f431c Color management: make it behave closer to trunk
Avoid using tricks with ibuf->profile to check whether image buffer is
in sequencer or linear space. Assume the whole sequencer works in non
linear float space and do transformation to linear where it;s needed
only.

This removes confusion from the code, fixes wrong behavior of some
effects.
2012-08-30 13:40:31 +00:00
Sergey Sharybin
63197444b4 Color management: some parts of previous commit were incorrect merged from WIP patch 2012-08-29 18:11:51 +00:00
Sergey Sharybin
2e1568d64e Color management: fix for wrong view being used as default in configuration file check
Also marked Jpeg2K as non-float format.
2012-08-29 18:08:34 +00:00
Sergey Sharybin
d6a617ff06 Merging r50248 through r50264 from trunk into soc-2011-tomato 2012-08-29 12:49:10 +00:00
Sergey Sharybin
7a13bc2196 Fix wrong user counter in world node trees
World is being localized without increasing ID users, so no need
to decrease ID users on localized world free.
2012-08-29 12:47:42 +00:00
Campbell Barton
635db3b306 code cleanup: add utility function BLI_path_is_rel() 2012-08-29 10:32:38 +00:00
Campbell Barton
1d9eaad73a code cleanup: replace term 'alpha' with '64' in makesdna, this was historic that dec-alpha was the first 64bit system blender was ported for, but now its not helpful to call it this way. 2012-08-29 09:51:38 +00:00
Campbell Barton
0bd759fddd new image operator now allows color grid (before was only grid on/off) 2012-08-29 08:17:38 +00:00
Campbell Barton
78ded61065 texture curves were not initialized (causing crash), own regression from moving curve initialization outside evaluation. 2012-08-29 07:58:36 +00:00
Campbell Barton
a3d4b98a30 code cleanup: move static mball vars into their own struct, wasnt very clear from reading code what was defined in the function. 2012-08-29 07:07:18 +00:00
Campbell Barton
7aeaeaf378 fix bug in mathutils.geometry.intersect_point_line() where 4D vectors were treated as 2D.
also change behavior to return a 2d vector when all args are 2D.
2012-08-28 11:27:46 +00:00
Jeroen Bakker
8fd7471143 cleanup pixel sampler code (pixel interpolations in compositor) 2012-08-28 10:41:37 +00:00
Campbell Barton
c43583a23a fix for own crash caused by curve refactor, now curve tables are initialized once when the tree is initialized.
thanks to Antony Riakiotakis for providing a fix, though this works a little different.
2012-08-28 10:02:10 +00:00
Campbell Barton
a798371df1 code cleanup: use switch for metaball type checks and minor style cleanup 2012-08-28 01:50:13 +00:00
Bastien Montagne
316b72647a Picky spell-checking... 2012-08-27 20:58:43 +00:00
Sergey Sharybin
6a5d8e355d Color management: display color managed RGB values in color sample line
Makes it possible to investigate color managed ranges.

Not ideal but it's the quickest thing which could be done to remove
current grading stoppers for Mango.
2012-08-27 15:23:14 +00:00
Campbell Barton
77f0be7fec support unary positive operators for vectors (same as numpy), so you can do 'vector_a = +vector_b', this makes a copy. 2012-08-27 13:40:19 +00:00
Sergey Sharybin
59042ad1ae Merging r50245 through r50247 from trunk into soc-2011-tomato 2012-08-27 12:00:39 +00:00
Sergey Sharybin
590251f55a File format fixes
- Add check for header field in BMP decoder. This is needed to distinguish
  whether file is indeed BMP image or not.
  Without this check Blender could easily crash when it'll try to load
  non-BMP image.
  Tested with files from own HDD, but all of them has got BM header field,
  more testing would be welcome.

- Made Jpeg2000 aware of J2K codec. Originally was needed to verify .j2c
  files here in the studio, but having support of this codec would be
  nice in general.
  Currently supports only reading in this codec, writing would still
  using jp2 codec.
2012-08-27 11:59:26 +00:00
Campbell Barton
5f902ed455 svn merge ^/trunk/blender -r50240:50244 2012-08-27 09:46:49 +00:00
Campbell Barton
13254cde8c Alternate mask spline feather offset calculation method: now there are 2 [Even | Smooth]
- Even preserves thickness but can give unsightly loops
- Smooth gives nicer shape but can give unsightly feather/spline mismatch for 'S' shapes created by beziers.

This is an example where smooth works much nicer.

http://www.graphicall.org/ftp/ideasman42/mask_compare.png
2012-08-27 09:44:56 +00:00
Sergey Sharybin
4035bf16e7 Fix #31853: Marker deletion invokes strip deletion 2012-08-27 09:15:48 +00:00
Sergey Sharybin
6c500159d7 Merging r50237 through r50240 from trunk into soc-2011-tomato 2012-08-27 09:02:26 +00:00
Sergey Sharybin
d6a92c9c31 Sequencer: proper cache invalidation when deleting sequences
Solves issue with effects not being recalculated when deleting their input.
2012-08-27 09:01:36 +00:00
Sergey Sharybin
1216dcffaa Style cleanup: spaces in sequencer scopes 2012-08-27 09:01:35 +00:00
Sergey Sharybin
b563039b8f Sequencer: fix crash of histogram view for float images
Overexposured pixels lead to wrong memory access in histogram making function
2012-08-27 09:01:34 +00:00
Sergey Sharybin
8716e9d98b Merging r50226 through r50236 from trunk into soc-2011-tomato 2012-08-27 08:28:29 +00:00
Campbell Barton
5d60dabef4 remove incorrect comment, add in useful one. 2012-08-27 08:23:51 +00:00
Campbell Barton
ae6907a065 fix [#32417] Grease Pencil color change + DopeSheet 'Summary' = crash
summery wasn't checking fcurve types.
2012-08-27 06:55:33 +00:00
Sergey Sharybin
f31d17220d Sequencer: fix for wrong color space sequencer effects were working in 2012-08-26 23:57:55 +00:00