griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
40,469 Commits 1 Branch 0 Tags
3979aad82fcd1e4a2a9352f2eb8a422fc35a511c
Commit Graph

8063 Commits

Author SHA1 Message Date
Sergey Sharybin
de4e940885 Remove mask cache hack added for mango project a while ago 
We've got new rasterizer which doesn't require cacheing anymore.
 2012-08-01 14:19:42 +00:00
Sergey Sharybin
3f5e3ae0bf Merging r49413 through r49450 from trunk into soc-2011-tomato 2012-08-01 14:14:22 +00:00
Campbell Barton
a199ae5368 style cleanup: whitespace, also add '?' to save over popup since it wasnt totally clear it was a question (user pointed this out, they thought it was just notification and lost their work). 2012-07-31 23:06:12 +00:00
Campbell Barton
872ebc7310 fill in dummy values when using movie clip distort node but compiled without libmv. 2012-07-31 22:01:44 +00:00
Campbell Barton
33a9cafc3b quiet spacenav output on linux for regular builds, ifdef signed int for msvc openmp. 2012-07-31 21:26:14 +00:00
Daniel Genrich
32bd936f18 Mask / Win64 compile fix: "Index variable in OpenMP 'for' statement must have signed integral type" 2012-07-31 19:37:33 +00:00
Campbell Barton
72a3fb15d7 changes to mask editing 
- use Alt to modify all mask feather at once while dragging.
- copying a multi-user mask from the interface works now.
- show masks when UV editing isnt used, rather then checking editmode (would give some odd/annoying image space header).
- add a fake mask user by default.
- moving points with LMB drag no longer selects them.
 2012-07-31 17:31:34 +00:00
Campbell Barton
4473b846fb multi-threaded sequencer buffer calculation for masks. 2012-07-31 16:37:47 +00:00
Campbell Barton
4c02549d5d remove references to raskter from compositor and BKE mask. 2012-07-31 16:04:47 +00:00
Campbell Barton
2e51811950 use the same rasterizer as the compositor for the sequencer. 2012-07-31 15:45:01 +00:00
Campbell Barton
c42d0189e5 resolve glitch in the image space where mask editing and UVs would conflict. 
now UV editing overrides mask.
 2012-07-31 14:16:27 +00:00
Campbell Barton
a86f44a77a svn merge ^/trunk/blender -r49410:49412 2012-07-31 13:44:51 +00:00
Campbell Barton
8f6197bd08 support for curve orco uv's as UV's in cycles. 
ideally these would be used as generated coordinates, but this is tricly because cycles calculates its own orco's and doesnt know about curve settings.
 2012-07-31 13:43:26 +00:00
Sergey Sharybin
ccf2f85b3e Merging r49390 through r49399 from trunk into soc-2011-tomato 2012-07-30 16:40:23 +00:00
Sergey Sharybin
2feac552eb Color management: initialize input color space for newly opening images 2012-07-30 16:07:37 +00:00
Daniel Genrich
46ac23d04e Fix: "void" function returning value. 2012-07-30 12:33:28 +00:00
Campbell Barton
a14fc54702 svn merge ^/trunk/blender -r49333:49361 2012-07-29 18:48:34 +00:00
Campbell Barton
7217927414 add inline functions for max/min ints, good to use when the arguments are function calls (we had a few of these). 2012-07-29 18:14:20 +00:00
Campbell Barton
f608b3c444 code cleanup: 
- building without python works again
- rename maxi/mini to i_max/i_min (so thay are available for function names)
- some minor edits to IK stretch setting (no functional changes).
 2012-07-29 17:49:14 +00:00
Campbell Barton
c41e1e434a code cleanup: replace MIN2/MAX2 with minf/maxf 2012-07-29 16:59:51 +00:00
Peter Schlaile
b6288e94eb == compositor == 
This adds an inpaint node to blender.

In case, you don't know, inpainting does this:
http://en.wikipedia.org/wiki/Inpainting

It's use cases in blender are 

* wire removal
* green screen background reconstruction

The node isn't tile based (for fundamental reasons), but very fast,
since it first builds a manhatten distance map and after that performs
color convolution only on the edges.

That's something, one should probably add also to the dilate node (in
step mode) to make it perform a lot better for dilate iterations greater
than 3.

It will bring it's computing time from O(n^3) down to O(n^2).
Take a look here for the details: 
http://ostermiller.org/dilate_and_erode.html )
 2012-07-29 15:48:38 +00:00
Campbell Barton
e32c60284a style cleanup 2012-07-29 00:20:28 +00:00
Sergey Sharybin
e6d80e5848 Merging r49300 through r49333 from trunk into soc-2011-tomato 2012-07-28 18:42:54 +00:00
Sergey Sharybin
7ecc0ba999 Fix regression in clip reloading -- after recent change movie used 
to be reset to default image size instead of it's actual size.
 2012-07-28 18:14:44 +00:00
Campbell Barton
3ec212fd71 patch [#32195] MASKS: Canonical Porter Duff algorithm for merge missing. 
from Troy Sobotka (sobotka)

This gives nicer blending then 'ADD', setting as default for new masks.
 2012-07-28 11:36:01 +00:00
Sergey Sharybin
a63ffa9ae3 Merging r49281 through r49286 from trunk into soc-2011-tomato 2012-07-27 11:07:55 +00:00
Campbell Barton
9a2d862123 clamp mask resolution, the occasional crash would happen failing to alloc when adding feather points very close together. 2012-07-27 11:05:08 +00:00
Campbell Barton
fc0bf22186 svn merge ^/trunk/blender -r49263:49280 2012-07-27 10:27:28 +00:00
Campbell Barton
b8d96bc011 mask motion blur shutter option 2012-07-27 10:20:36 +00:00
Sergey Sharybin
52aa7a4a4c Added utility function to return marker's subframe position 
Used in mask parenting stuff.
 2012-07-27 10:12:58 +00:00
Campbell Barton
1543a713a8 copying a mask now copies its animation data too 2012-07-27 08:36:48 +00:00
Campbell Barton
c42b23030b copy support for mask datablocks 2012-07-27 08:18:11 +00:00
Campbell Barton
61469d2e3e code cleanup: remove unneeded 'struct' qualifiers 2012-07-26 22:47:05 +00:00
Sergey Sharybin
f6b542aeb2 Merging r49261 through r49263 from trunk into soc-2011-tomato 2012-07-26 18:05:42 +00:00
Campbell Barton
4c2de5e0c7 fix some types and incorrect info 2012-07-26 17:41:09 +00:00
Sergey Sharybin
e35d1ee8b8 Merging r49253 through r49254 from trunk into soc-2011-tomato 2012-07-26 15:51:33 +00:00
Sergey Sharybin
fb520785b6 Run versioning stuff for animation summary color again 
Seems it was messed up at some point or changes weren't applied
synchronized, which lead to lots of files with wrong color used.
 2012-07-26 15:50:45 +00:00
Campbell Barton
fed7a2b76b svn merge ^/trunk/blender -r49241:49244 2012-07-26 10:55:07 +00:00
Sergey Sharybin
2157031dc0 Fix #31550: Active Armature bone hardly distinguishable from other selected bones 
Made active bone color a bit brighter and made it a userpref option.
 2012-07-26 10:53:59 +00:00
Sergey Sharybin
075e1180a3 Merging r49226 through r49238 from trunk into soc-2011-tomato 2012-07-26 09:51:28 +00:00
Campbell Barton
ab0fa803cd image histogram/sample line couldn't show HDR colors. now allow zooming the view to see colors up to 10.0 2012-07-26 09:06:23 +00:00
Campbell Barton
be23539a94 code cleanup: use BKE_pain_ prefix for paint funcs. also minor style edits 2012-07-25 22:37:52 +00:00
Campbell Barton
2b133b14ab mask/image viewer now works with non 1:1 image aspect, editing masks in the image viewer should be generally usable now though still some TODO's left. 2012-07-25 20:39:49 +00:00
Sergey Sharybin
0051d24b23 Merging r49191 through r49211 from trunk into soc-2011-tomato 2012-07-25 15:07:47 +00:00
Campbell Barton
1091030c11 mask now draws in the image view, misc minor edits. 2012-07-25 13:44:59 +00:00
Campbell Barton
65f94b8c0b svn merge ^/trunk/blender -r49177:49186 2012-07-24 21:11:22 +00:00
Campbell Barton
d9dbea1836 move mask and draw settings into its own struct to be shared between spaces. 2012-07-24 20:33:55 +00:00
Campbell Barton
f7a1819559 svn merge ^/trunk/blender -r49167:49175 2012-07-24 12:38:37 +00:00
Sergey Sharybin
a6d62e9e87 Correction to previous commit -- make sure float buffer is not being changed 
while color management transformations are running.
 2012-07-24 12:18:40 +00:00
Sergey Sharybin
a0bdc54572 Color management: fix memory corruption when using border rendering 
Image's get render result function used to modify ImBuf directly,
without making needed invalidates to color management cache when
it's needed.
 2012-07-24 11:49:21 +00:00