Commit Graph

47594 Commits

Author SHA1 Message Date
Campbell Barton
2ca89f7add style cleanup 2012-06-15 15:04:56 +00:00
Brecht Van Lommel
77ec3ae9d1 Fix more of #31789: cycles border render going out of view giving wrong result. 2012-06-15 15:01:32 +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
Campbell Barton
05153fb08d svn merge ^/trunk/blender -r47958:47961 2012-06-15 14:47:34 +00:00
Campbell Barton
f04546018f style cleanup 2012-06-15 14:45:49 +00:00
Campbell Barton
4f80c3464f fix for building without libmv 2012-06-15 14:40:01 +00:00
Sergey Sharybin
64884f557d Merging r47949 through r47958 from trunk into soc-2011-tomato 2012-06-15 14:28:44 +00:00
Sergey Sharybin
40a726e048 Code deduplicaiton in motion tracking slide operator 2012-06-15 14:26:27 +00:00
Sergey Sharybin
b52c2f2bed Style cleanup 2012-06-15 14:11:23 +00:00
Sergey Sharybin
fb278a501e Ensure enums in DNA files has got explicit values
See http://wiki.blender.org/index.php/Dev:Doc/CodeStyle#Macros.2C_Enums.2C_Inline_functions
2012-06-15 14:11:05 +00:00
Campbell Barton
e11692bc73 fix for other uninitialized values for the split viewer node as well as incorrect frees for gaussian blue nodes. 2012-06-15 13:56:54 +00:00
Campbell Barton
d0ebb1df57 fix for using un-initialized memory in the new compositor for the split view node. 2012-06-15 13:35:24 +00:00
Sergey Sharybin
6f529c9e43 Merging r47895 through r47948 from trunk into soc-2011-tomato 2012-06-15 12:29:20 +00:00
Sergey Sharybin
82473f67b3 Core matte input for keying node
This matte could be used to force alpha be at high values in areas where
algorithm detects it as edge or background color.
2012-06-15 11:53:51 +00:00
Sergey Sharybin
fa3dd67b42 Fix potential memory leak in marker sliding operator 2012-06-15 11:42:09 +00:00
Sergey Sharybin
be3c12b75b Move selection operators of Clip Editor into their own file 2012-06-15 11:40:04 +00:00
Sergey Sharybin
8da0a03774 2D stabilization didn't work since clip start frame commit 2012-06-15 11:15:48 +00:00
Sergey Sharybin
f0c724219d Internal refactoring of tracking module, should be no functional changes
- Re-arrange functions in headers and implementation file to make them
  more grouped by entity they're operating with. Also order of functions
  in implementation file should match order of functions in header for
  easier navigation.

- Rename some functions to match conventions of naming public functions.
- Some code de-duplication, still some room for improvements tho.
- Split main 2D tracking functions into smaller steps to make it more clear.

Accidentally OpenMP was disabled in some of previous commits, re-enable it.
2012-06-15 11:03:23 +00:00
Campbell Barton
ec755bdfa7 style cleanup: composite/blur 2012-06-15 09:58:52 +00:00
Gaia Clary
3264db3797 Collada (Exporter) improved export panel layout minor code cleanup 2012-06-15 09:56:06 +00:00
Gaia Clary
e95e2419f8 Collada (Exporter) improved export panel layout 2012-06-15 09:51:27 +00:00
Campbell Barton
35d1a1cbd8 fix for own mistake - sampling was adjusting alpha when it shouldn't, also make spacebar reset the accumulated color while eyedropping. 2012-06-15 08:33:33 +00:00
Sergey Sharybin
c9f1477fb0 Garbage mate input for keying node
This adds garbage matte input to new keying node which is used to
force occluding things which can not be eliminated by color operations.

White areas defines areas which should be removed from final result.
2012-06-15 08:26:49 +00:00
Campbell Barton
9c55e7b995 add node scale offset for old compositor too - also fix for error in last commit. 2012-06-15 08:01:41 +00:00
Campbell Barton
46ea5670db scale node - framing offset: compatible with camera shiftX/Y and the viewport option. 2012-06-15 07:50:27 +00:00
Guillermo S. Romero
e879ee1798 SVN maintenance. 2012-06-15 02:21:07 +00:00
Nicholas Rishel
4e4e5bb7ff Comment no longer accurate. 2012-06-15 01:43:07 +00:00
Joseph Eagar
bd9192670b Added option in shift-g to select verts by number of connected edges (valence). 2012-06-15 01:43:01 +00:00
Campbell Barton
9355bece59 click dragging with the eye dropper now averages out colors - useful when you have grainy footage of a green screen. 2012-06-14 22:48:40 +00:00
Campbell Barton
813348a4ee code cleanup: replace most fRGB functions with inline vector functions 2012-06-14 19:22:55 +00:00
Campbell Barton
c42d4b101b remove unused fRGB defines and change float member to bool. 2012-06-14 19:09:00 +00:00
Campbell Barton
91d0ef0a7e scale node for new compositor now supports framing option. 2012-06-14 18:55:35 +00:00
Gaia Clary
2cc9ecad55 fix for exporting armature, when it is explicitly selected 2012-06-14 18:29:29 +00:00
Campbell Barton
ffc9e340b1 new scaling options to scale footage without stretching - add stretch/fit/crop to compositor scale node, default behavior isnt changed.
this is only added for the old compositor, will add to the new compositor next.
2012-06-14 16:55:55 +00:00
Campbell Barton
550824968c style cleanup 2012-06-14 16:15:37 +00:00
Campbell Barton
1a39e74131 revert own commits 47907, 47908 after some discussion this is really bad and needs some different solution. 2012-06-14 16:13:09 +00:00
Campbell Barton
0b2fcf4368 change to scale node - multiply scale by scene size, without this theres no reliable way to match different scaled footage to an output and still have useful preview's at <100 percentage. 2012-06-14 15:04:40 +00:00
Gaia Clary
91eed57e62 Collada: cleanup sort function for 2012-06-14 14:48:52 +00:00
Gaia Clary
43864f9103 fix a nullpointer exception when data missing in dae file 2012-06-14 14:47:41 +00:00
Thomas Dinges
931aeeb1f2 * Add RNA comment for Lamp icon defines. 2012-06-14 14:04:55 +00:00
Thomas Dinges
29e5f72395 Interface:
* Rename "Clear Game Property" to "Rename Game Properties", because the operator deletes all game properties from all selected object(s), not only one.

This fixes [#31828], patch by Philipp Oeser.
2012-06-14 14:02:15 +00:00
Thomas Dinges
201e9d815a Bugfix for [#31829] Add lamp icons missing. Patch by Philipp Oeser.
Note: If you do code cleanups, and revert make sure you revert it correct and not halfway. ;-) r47034
2012-06-14 13:54:55 +00:00
Sergey Sharybin
a2c862570e Blender is using tabs, not spaces for indentation 2012-06-14 13:48:04 +00:00
Sergey Sharybin
9a88d9c907 Synchronize changes with trunk:
- Revert some unneeded code-style changes which were done in tomato
- Remove classic compositor's keying node exec callback. It was too
  outdated and not sure if we shall support two versions of compositors.
- Revert changes made to some other nodes which were needed to make
  classic compositor's keying node working.
2012-06-14 12:43:21 +00:00
Sergey Sharybin
a92194bbc5 Merging r47888 through r47894 from trunk into soc-2011-tomato 2012-06-14 12:34:01 +00:00
Sergey Sharybin
1f19bacf8e Kaying node from tomato branch
Merge keying node from tomato branch into trunk.

It was considered stable and helpful by Mango team and it'll help
studio pipeline, because nodes would stop disappearing when opening
files in current trunk.

Full information about keying nodes could be found there:
http://wiki.blender.org/index.php/User:Nazg-gul/Keying
2012-06-14 12:19:13 +00:00
Sergey Sharybin
d56e77ada5 Keying Screen node from tomato branch
Merge Keying Screen node developed in tomato branch into trunk.

This node is aimed to make dealing with non-even greenscreens better
by generating gradiented image which could be used a input for keyer
nodes.

Based on building voronoi diagram using motion tracking markers as
sites position and average pattern color as color for that site.

Pretty straignforward node, some documentation is there
http://wiki.blender.org/index.php/User:Nazg-gul/Keying#Screen_color
2012-06-14 12:18:42 +00:00
Campbell Barton
e2cda811ac fix for years old bug - OpenEXR always adding alpha channel on load (how did nobody notice this?). 2012-06-14 12:05:38 +00:00
Campbell Barton
d3c8cdc1c3 code cleanup: zbuf/alpha exr writing 2012-06-14 11:44:05 +00:00
Sergey Sharybin
da45aa9803 Merging r47886 through r47887 from trunk into soc-2011-tomato 2012-06-14 11:27:37 +00:00