Commit Graph

66005 Commits

Author SHA1 Message Date
Bastien Montagne
b9e544e823 Adding brazilian portuguese language, as requested by portuguese team. 2012-09-05 18:35:22 +00:00
Lukas Toenne
d490277194 Quick fix for compiler error. Somehow the isfinite symbol got lost for SVM too now, no idea how this happened or where it actually came from. This will likely also cause trouble with CUDA/OpenCL compilers, will have to be fixed properly later. 2012-09-05 18:12:17 +00:00
Lukas Toenne
674d295df3 Fix for attribute lookup in OSL. This uses a map in the OSL globals instead of the device texture. 2012-09-05 17:08:56 +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
c1dc375379 Sequencer: show color sample line in image display mode only 2012-09-05 14:11:22 +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
Antony Riakiotakis
9ca25136a1 Fix compositor crash. g_highlightedNodes can be NULL. 2012-09-05 13:50:24 +00:00
Sergey Sharybin
ade9acca41 Color Management: fix for tiled image draw and remove unused code 2012-09-05 12:14:09 +00:00
Lukas Toenne
a823207d81 Cycles fix: particle standard attribute had no name conversion yet. 2012-09-05 12:06:44 +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
Campbell Barton
e2eea6c38d fix/workaround [#31555] Username with special chars in Windows 7
Theres a bug where python/windows ignores PYTHONIOENCODING, workaround this by manually overriding the stdout/stderr.
2012-09-05 09:33:15 +00:00
Jeroen Bakker
7efe2153b2 * gcc 4.7 is more strict. This patch will remove 'non virtual
destructor warnings' in the core of the compositor.
2012-09-05 08:50:25 +00:00
Lukas Toenne
f3a91f461c Fix for OSL memory leak. The context creation for OSL is now done in the shader_setup_* functions, since it should specific to the sample being worked on. The the context release then happens in the kernel_shader functions after shader evaluation is done. Care has to be taken to ensure the shader_release function is also called in cases where the path integration is cancelled early, this was the main cause for unreleased contexts and subsequent new allocations. 2012-09-05 08:12:22 +00:00
Campbell Barton
99fcec3334 fix [#29431] "Normalize All" from Weight Tools don't work correctly 2012-09-05 04:16:09 +00:00
Campbell Barton
a512cac545 code cleanup: move get_selected_defgroups into object_deform.c and make it behave like similar functions, also when drawing vertex weight colors, only call this function when multi-paint is enabled. 2012-09-05 03:45:32 +00:00
Campbell Barton
84dc5c2992 code cleanup: move functions for getting defgroup arrays from objects out of editors into blenkernel, since they are generally useful. 2012-09-05 02:51:55 +00:00
Campbell Barton
a4b71f4e01 fix for various redundant checks and possibly fix some crashes in rare situations. 2012-09-05 01:42:52 +00:00
Thomas Dinges
65b214ed04 * Forgot to commit CMake change for the Brick texture. 2012-09-05 00:59:04 +00:00
Campbell Barton
2016791fee add missing files from cmakes lists 2012-09-05 00:52:35 +00:00
Campbell Barton
8cf9e5f8c3 change templates to call modal_handler_add() is called last since any errors between calling this function and returning will crash blender. see [#30687] 2012-09-05 00:11:39 +00:00
Thomas Dinges
ebe29c3f84 OSL:
* Noise Texture is rendering now.
2012-09-04 23:34:08 +00:00
Thomas Dinges
0206d7d02b Cycles / OSL:
* Ported the Brick Texture to OSL. Renders fine :)
2012-09-04 22:33:11 +00:00
Campbell Barton
dba5ef3ba8 code cleanup: python - pass multiple args to string startswith() / endswith() functions rather than calling multiple times. 2012-09-04 20:26:42 +00:00
Campbell Barton
1d4316f35f fix [#32490] Compsitor crashes on missing OpenEXR multilayer files 2012-09-04 19:42:09 +00:00
Campbell Barton
306e2b4878 stule cleanup 2012-09-04 18:47:08 +00:00
Campbell Barton
068cceab6c fix for some errors reported by http://clang.blenderheads.org/trunk/ in r50384.
- when renderlayers could not be found in save_render_result_tile() blender would crash.
- RE_engine_end_result() / rna end_result() didn't set result argument as required.
... also some style cleanup.
2012-09-04 18:27:47 +00:00
Lukas Toenne
95b85a8c37 Revert "Use one context per OSL thread. Not sure if this actually works, but the simple renderer example in OSL does it this way."
This does not actually work: The context must not be shared between threads, but using the same context between different samples actually seems to prevent OSL from switching between shaders. The proper solution would be to ensure memory pooling works correctly.

This reverts commit 69f87e69258d6266dcb20f09f7e3d4021e663432.
2012-09-04 17:28:36 +00:00
Sv. Lockal
927b7ed303 Do not show %t to user on right click menu buttons which use "Name%t|...%x0|..." syntax 2012-09-04 17:09:40 +00:00
Sergey Sharybin
b3797d904d Sequencer: avoid allocating image buffer on every modifier
This means that modifier would operate on buffer which was passed to it,
without creating copy of image buffer and operating on it.

All current modifiers fit into this model and if it would need to have
original buffer on modifier calculation, that particular modifier can
create copy.

Gives some percentage of boost.
2012-09-04 16:55:12 +00:00
Thomas Dinges
0e3f3a0aef OSL:
* Holdout shader is now working in OSL.
2012-09-04 16:54:32 +00:00
Lukas Toenne
64a4a05d31 Fix for OSL input parameter name mapping. When assigning input constants to shader parameters, use the compatible_name function to strip whitespace. 2012-09-04 16:47:00 +00:00
Lukas Toenne
f51eb99faa Minor syntax error in musgrave osl texture. 2012-09-04 16:46:56 +00:00
Thomas Dinges
f2caaaec9b OSL:
* WIP commit of fixes for musgrave and wave.
2012-09-04 16:00:12 +00:00
Sergey Sharybin
3d7fd3c158 Sequencer: remove effect mask input
Initial idea of this input was re-designed in a bit more flexible
way using modifiers.
Also since Color Balance (which was the only thing using effect
mask input) was moved to the modifiers, this input field became
rudiment.

It's pretty tricky to write versioning code to prevent possible
data in cases this field was used, but hope it wouldn't be difficult
to switch to modifiers masks.
2012-09-04 13:48:24 +00:00
Sergey Sharybin
159c1b4b22 Compilation fix for recent merge commit 2012-09-04 13:37:58 +00:00
Sergey Sharybin
122cb86d15 Sequencer: remove strip's color balance in favor of modifiers
Having two ways to control color balance now seems a bit overkill
and not clear.

Removed old Color Balance settings from the interface and logic,
added versioning code to convert this settings to modifier.

Unfortunately, since color balance was a pointer, it's not actually
possible to preserve compatibility of old files saved in new
blender and opened back in old blender.

Hopefully there's no regressions :)
2012-09-04 13:37:53 +00:00
Brecht Van Lommel
adea12cb01 Cycles: merge of changes from tomato branch.
Regular rendering now works tiled, and supports save buffers to save memory
during render and cache render results.

Brick texture node by Thomas.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Brick_Texture

Image texture Blended Box Mapping.
http://wiki.blender.org/index.php/Doc:2.6/Manual/Render/Cycles/Nodes/Textures#Image_Texture
http://mango.blender.org/production/blended_box/

Various bug fixes by Sergey and Campbell.
* Fix for reading freed memory in some node setups.
* Fix incorrect memory read when synchronizing mesh motion.
* Fix crash appearing when direct light usage is different on different layers.
* Fix for vector pass gives wrong result in some circumstances.
* Fix for wrong resolution used for rendering Render Layer node.
* Option to cancel rendering when doing initial synchronization.
* No more texture limit when using CPU render.
* Many fixes for new tiled rendering.
2012-09-04 13:29:07 +00:00
Sergey Sharybin
68563134d4 Mango request: display sliders for current point in curve mapping
--
svn merge -r49893:49894 ^/branches/soc-2011-tomato
2012-09-04 12:40:47 +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
b0bf16b28c Color Management: OpenCOlorIO configuration file cleanup
- Remove unused color space and LUTs/matrices
  There were couple of spaces for specific cameras which are unlikely
  be used by general blender users. Think better to keep this things
  as clean as possible for official builds, it could easily be extended
  for some specific pipeline.

- Move rec709 view to it's own display. Such way makes more sense.
  Probably it'll actually make sense to remove p3dci and rec709
  displays from default configuration. Not sure how often such a
  displays are used by blender users.
  XYZ display could still be useful to help generating DCP.

- Reshuffled views a bit. Added Default view to most of displays which
  is default sRGB transformation for sRGB display, ACES -> CIE XYZ for
  XYZ display.
  Should make things a bit clearer for understanding.
2012-09-04 12:32:25 +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