Commit Graph

205 Commits

Author SHA1 Message Date
Sergey Sharybin
48e23021e1 Color management: display descriptions for color spaces
This descriptions are being read from ocio configuration and
exposed into UI via standard enum's tooltips.
2012-07-16 10:51:02 +00:00
Sergey Sharybin
5a033cae75 Color management: cleanup of ocio config file
- Minor style cleanup

- Made scene linear space rec709 instead of aces
  Reference space is still aces

- Get rid of hardcoded rec -. rec709 transformation on view transforms
  This would make view transform be applied on a reference color space
  how it's supposed to be.
  Since scene linear is rec709 such a hardcoded transform isn't needed
  anymore.
  This also fixes wrong Log view transform which used to look really
  weird and now it's nice and smooth.

- Also made changes to SPI and Nuke configurations to make them behave
  properly with reference space of aces.

- Renamed Nuke's rec709 space to nuke_rec709. Probably it could  be
  replaced with scene rec709, but that's requires more investigation.
2012-07-16 10:50:38 +00:00
Sergey Sharybin
6952d77262 Color management: added view transforms form nuke-default and spi-vfx
- Added some extra view transforms to play with. It's not absolutely
  correct in terms this views were changed to use aces space as input.
  This gives exactly the same result as if using stand-alone spi-vfx
  and nuke-default configuration, but for real merge of this configs
  it'll be needed to add extra input spaces and transformations between
  them.

- Replaced hard-coded aces input color space with default ocio
  linear space which makes it easier to play with different
  configurations.

- Fixed SCons installation of color management configuration which
  used to skip copying LUTs when there was "luts" folder in install
  destination.

- Print whether OCIO was enabled when building with CMake.
  Could be helpful due to OCIO is being automatically disabled
  if needed libraries are missed.
2012-07-01 20:12:38 +00:00
Sergey Sharybin
473f8171bb Color management: remove unused baked LUTS 2012-06-30 12:40:02 +00:00
Sergey Sharybin
b984fdf393 Color management fixes
- Fixed memory leak caused by incorrect handling of cached buffer
  in cases if it was marked as dirty
- Do not use 3D LUT for RRT -- they can't be easily baked into 3D
  LUT without being clamped to 0..1 space
- Make sure blender compiles without OCIO support
2012-06-30 12:36:31 +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
858ad8d725 svn merge ^/trunk/blender -r48078:48105 2012-06-20 07:43:49 +00:00
Campbell Barton
98e6912480 style cleanup 2012-06-19 22:17:19 +00:00
Brecht Van Lommel
9e79af949b Tomato: fix wrong RRT transform. 2012-06-15 16:09:21 +00:00
Sergey Sharybin
471627ba96 Commit current patch needed for color pipeline investigation in Mango Project
This commit simply adds view transform option for image editor. This transform
is being applied on original linear color when float buffer is being converted
into sRGB byte buffer.

Currently supports such transformations:
- ACES ODT ToneCurve transform which shall preserve color ranges on such
  a conversion.
- OCIO Raw, Log and RRT view transforms

This commit also contains integration of OCIO backends to Blender, so
now there's c-api and configuration file. Most of things were got from
branch where Xavier Thomas and Lukas Toene were working.

NOTE:
This is just for testing our pipeline, please do not bother me with messages
it's done wrong. It is done correct to support our own pipeline for now, and
real design would be created later when current stoppers for the project are
gone.
2012-06-15 15:00:51 +00:00
Sergey Sharybin
26f9fe3962 Merging r47581 through r47603 from trunk into soc-2011-tomato 2012-06-08 09:36:17 +00:00
Jeroen Bakker
de7fe937ff * Added OpenCL kernel for bokeh blur
* Uncomment COM_OPENCL_ENABLED from COM_defines.h to test
2012-06-08 09:17:07 +00:00
Sergey Sharybin
14a56caee6 Merging r46725 through r46963 from trunk into soc-2011-tomato 2012-05-24 09:47:29 +00:00
Nicholas Bishop
d9ce31104f Add skin modifier icon created by Julio Iglesias.
Skin modifier documentation:
http://wiki.blender.org/index.php/User:Nicholasbishop/SkinModifier
2012-05-22 15:19:13 +00:00
Sergey Sharybin
4359564d9b Merging r46495 through r46557 from trunk into soc-2011-tomato 2012-05-11 17:39:57 +00:00
Nicholas Bishop
450bb3afcb Add new mask-brush icon from Julio Iglesias. 2012-05-10 20:35:12 +00:00
Sergey Sharybin
38b80df618 Merging r45936 through r46042 from trunk into soc-2011-tomato
y
2012-04-28 18:27:32 +00:00
Sergey Sharybin
e75e40c972 Release commit, 2.63!
Special thanks to Mango team for awesome splash screen!
And everybody else who made this release! :)
2012-04-26 17:49:48 +00:00
Sergey Sharybin
bfca79a657 Merging r44227 through r45619 from trunk into soc-2011-tomato 2012-04-14 10:46:47 +00:00
Campbell Barton
6046500ee5 - startup.blend's temp dir was pointing to sergeys user dir, now point to /tmp
- fix error in ctodata.py (was adding dummy bit)
- make UV hide from last commit more readable.
2012-04-13 08:18:54 +00:00
Campbell Barton
1078ac78a2 set executable option and some minor changes to ctodata/datatoc 2012-04-13 07:49:59 +00:00
Campbell Barton
9fd6c7a962 update preview.blend so it doesn't need to convert from mfaces to mpolys every load. 2012-04-10 09:22:39 +00:00
Bastien Montagne
45ea047725 Update to i18n font: a few small cyrillic letters were missing...
Found by Chingis Jumaliev, which did a first edit, I completed it from current Debian’s droidsans version, now cyrillic should be complete.
2012-04-04 15:39:48 +00:00
Nicholas Bishop
110fa100ff Re-enable the clay strips sculpt brush.
Most of the tool code was already in place, only significant
functionality change is that anchored stroke works now.

TODO:
* Gave it a new icon, but could use a better one
* Default .blend should have a clay strips brush
2012-03-18 11:44:14 +00:00
Thomas Dinges
1002714fd8 2.6 User Interface:
* New Icons for the File menu, patch by David Klein (cgeffex). Thanks a lot!
* This patch also adds a new icon for the use_filter_text in Filebrowser.
2012-03-15 14:36:54 +00:00
Sergey Sharybin
b5628b45ff Merging r44129 through r44139 from trunk into soc-2011-tomato 2012-02-16 07:11:50 +00:00
Ton Roosendaal
18371f792d The traditional release commit, 2.62!
Special thanks to splash committee:
Kevin Hays, Per Gantelius and Wray Bowling.

Splash by Alexey Lugovoy.
2012-02-15 16:44:44 +00:00
Sergey Sharybin
4eb006f6f5 Merging r44070 through r44108 from trunk into soc-2011-tomato 2012-02-14 15:19:49 +00:00
Thomas Dinges
9c2d3a8ed1 2.6 UI Modifier Icons:
* New Ocean Icon, created by Leon Cheung. Thanks! Approved by Lukas and myself.
* New Warp Icon, created by "Zafio"

Blender artists Thread where the Icons come from: http://blenderartists.org/forum/showthread.php?243354-Call-for-Modifier-Icons!
2012-02-12 19:57:47 +00:00
Sergey Sharybin
a666441d70 Merging r42945 through r43024 from trunk into soc-2011-tomato 2011-12-31 09:23:06 +00:00
Nicholas Bishop
14f5f264ec Small tweaks from Zafio for the remesh modifier icon 2011-12-30 23:10:23 +00:00
Nicholas Bishop
289c8b5758 Add remesh modifier (dual contouring).
This patch adds a new remeshing modifier. The algorithm is based on
the paper "Dual Contouring of Hermite Data", and the implementation
was contributed to Blender by Dr. Tao Ju.

The contributed code is in intern/dualcon, and was modified to compile
under gcc and work on 64-bit systems. Files not needed for Blender
were removed and a small C wrapper was added in order to interface it
with Blender. The rest of the patch is just standard modifier stuff.

Reviewed by Sergey, code review link:
http://codereview.appspot.com/5491053/

The remesh icon was contributed by Zafio:
http://blenderartists.org/forum/showthread.php?240751-Request-for-modifier-icon/page2.
Thanks to everyone in that thread for the icon proposals and
discussion.

Documentation and examples on the Blender wiki:
http://wiki.blender.org/index.php/User:Nicholasbishop/RemeshModifier

In case the history is needed for anything, check the remesh-modifier
branch of this git repository:
https://gitorious.org/~nicholasbishop/blenderprojects/nicholasbishop-blender
2011-12-30 21:11:40 +00:00
Sergey Sharybin
535aee820b Merging r42602 through r42620 from trunk into soc-2011-tomato 2011-12-14 06:12:20 +00:00
Ton Roosendaal
60eba40773 First Blender 2.61 commit! (Sneaked in quick tooltop fix too).
A tag will happen after this commit.
2011-12-13 16:44:31 +00:00
Bastien Montagne
801721e79d Quick fix for "droidsans" Blender font, should fix missing umlaut and accent on capitals.
Somewhere in the process of generating that Frankenstein font, most latin capital glyphs lost there "modifier" part (umlaut, accent, etc.). I added them again using fontforge auto tool, but not to all of them though, as some would add a shift to the whole font... :/

This is not a nice fix (the correct way would be to merge again the whole latin part of dejavu into blender font, but again, I couldn’t manage to do it without an ugly global font shift), but at least it works, doesn’t shift the font, and add back most modified capitals.
2011-11-23 16:30:41 +00:00
Bastien Montagne
b473aeb1d1 Reverting part of the previous i18n font update: arabic is back to droidsans font, with missing Persian glyphs (turned out there were only two). Thanks to Yousef (bat3a), Amin (loemoon) and Dalai (dfelinto). [The draw back is, other arabic-familly languages might miss other glyphs... but we’ll adress this in due time, if needed!]
Same added devanagari (for Nepali, but used also by Hindi...) from Samyak-devanagari font...
2011-11-22 07:40:01 +00:00
Bastien Montagne
8992ed9cdd i18n update:
*Update of i18n font, arabic should be more complete (now using DejaVuSans version), added devanagari (for Nepali, but used also by Hindi...) from Samyak-devanagari font...
*Enable Nepali translation, as it now has a font to display!
2011-11-21 23:57:09 +00:00
Miika Hamalainen
afeb0eeaf0 Dynamic Paint merge:
Commit Dynamic Paint from "soc-2011-carrot" branch into trunk.

End-user documentation:
http://wiki.blender.org/index.php/Doc:2.6/Manual/Modifiers/Simulation/Dynamic_Paint

GSoC wiki page:
http://wiki.blender.org/index.php/User:MiikaH/GSoC-2011-DynamicPaint
2011-11-10 10:24:34 +00:00
Miika Hamalainen
1b4a54ad73 Merge with trunk r41701 2011-11-09 15:46:53 +00:00
Sergey Sharybin
c0f65b774e Fix #29198: Problem with text interface when you enable the International fonts
Not sure why, but doing the same things as in script from FontForge UI, there's
no issues described in report. Probably matter of some default settings.
Hope it works now fine for everyone.
2011-11-08 15:12:41 +00:00
Miika Hamalainen
edec46b0a6 Merge with trunk r41625 2011-11-07 16:36:49 +00:00
Sergey Sharybin
27d42c63d9 Camera tracking integration
===========================

Commiting camera tracking integration gsoc project into trunk.

This commit includes:

- Bundled version of libmv library (with some changes against official repo,
  re-sync with libmv repo a bit later)
- New datatype ID called MovieClip which is optimized to work with movie
  clips (both of movie files and image sequences) and doing camera/motion
  tracking operations.
- New editor called Clip Editor which is currently used for motion/tracking
  stuff only, but which can be easily extended to work with masks too.

  This editor supports:
  * Loading movie files/image sequences
  * Build proxies with different size for loaded movie clip, also supports
    building undistorted proxies to increase speed of playback in
    undistorted mode.
  * Manual lens distortion mode calibration using grid and grease pencil
  * Supervised 2D tracking using two different algorithms KLT and SAD.
  * Basic algorithm for feature detection
  * Camera motion solving. scene orientation

- New constraints to "link" scene objects with solved motions from clip:

  * Follow Track (make object follow 2D motion of track with given name
    or parent object to reconstructed 3D position of track)
  * Camera Solver to make camera moving in the same way as reconstructed camera

This commit NOT includes changes from tomato branch:

- New nodes (they'll be commited as separated patch)
- Automatic image offset guessing for image input node and image editor
  (need to do more tests and gather more feedback)
- Code cleanup in libmv-capi. It's not so critical cleanup, just increasing
  readability and understanadability of code. Better to make this chaneg when
  Keir will finish his current patch.

More details about this project can be found on this page:
    http://wiki.blender.org/index.php/User:Nazg-gul/GSoC-2011

Further development of small features would be done in trunk, bigger/experimental
features would first be implemented in tomato branch.
2011-11-07 12:55:18 +00:00
Miika Hamalainen
46ae692710 Merge with trunk r41342 2011-10-28 17:00:53 +00:00
Joshua Leung
015b7b4fa9 Renaming the extensionless "blenderbuttons" to "blender_icons.png" 2011-10-28 00:09:13 +00:00
Guillermo S. Romero
82c84f4b58 Remove some more $Id$ that still were left after r41227 and r41228. 2011-10-23 19:01:59 +00:00
Guillermo S. Romero
6105199668 Remove the svn:keywords property. 2011-10-23 18:38:16 +00:00
Campbell Barton
4a04f72069 remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n 2011-10-23 17:52:20 +00:00
Miika Hamalainen
d4541fd891 Merge with trunk r41197 2011-10-22 16:43:23 +00:00
Thomas Dinges
952560dc02 * Re-commit splash screen with Alpha header. 2011-10-22 16:01:19 +00:00
Campbell Barton
d132b08f33 move fonts/ and locale/ dirs into release/datafiles, since blender wasn't finding them in their current location and so to test international characters you had to 'make install'.
updated scons/cmake/translation-scripts.
2011-10-21 03:00:28 +00:00