Commit Graph

11497 Commits

Author SHA1 Message Date
a14fc54702 svn merge ^/trunk/blender -r49333:49361 2012-07-29 18:48:34 +00:00
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
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
c41e1e434a code cleanup: replace MIN2/MAX2 with minf/maxf 2012-07-29 16:59:51 +00:00
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
e32c60284a style cleanup 2012-07-29 00:20:28 +00:00
e6d80e5848 Merging r49300 through r49333 from trunk into soc-2011-tomato 2012-07-28 18:42:54 +00:00
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
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
a63ffa9ae3 Merging r49281 through r49286 from trunk into soc-2011-tomato 2012-07-27 11:07:55 +00:00
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
fc0bf22186 svn merge ^/trunk/blender -r49263:49280 2012-07-27 10:27:28 +00:00
b8d96bc011 mask motion blur shutter option 2012-07-27 10:20:36 +00:00
52aa7a4a4c Added utility function to return marker's subframe position
Used in mask parenting stuff.
2012-07-27 10:12:58 +00:00
1543a713a8 copying a mask now copies its animation data too 2012-07-27 08:36:48 +00:00
c42b23030b copy support for mask datablocks 2012-07-27 08:18:11 +00:00
61469d2e3e code cleanup: remove unneeded 'struct' qualifiers 2012-07-26 22:47:05 +00:00
f6b542aeb2 Merging r49261 through r49263 from trunk into soc-2011-tomato 2012-07-26 18:05:42 +00:00
4c2de5e0c7 fix some types and incorrect info 2012-07-26 17:41:09 +00:00
e35d1ee8b8 Merging r49253 through r49254 from trunk into soc-2011-tomato 2012-07-26 15:51:33 +00:00
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
fed7a2b76b svn merge ^/trunk/blender -r49241:49244 2012-07-26 10:55:07 +00:00
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
075e1180a3 Merging r49226 through r49238 from trunk into soc-2011-tomato 2012-07-26 09:51:28 +00:00
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
be23539a94 code cleanup: use BKE_pain_ prefix for paint funcs. also minor style edits 2012-07-25 22:37:52 +00:00
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
0051d24b23 Merging r49191 through r49211 from trunk into soc-2011-tomato 2012-07-25 15:07:47 +00:00
1091030c11 mask now draws in the image view, misc minor edits. 2012-07-25 13:44:59 +00:00
65f94b8c0b svn merge ^/trunk/blender -r49177:49186 2012-07-24 21:11:22 +00:00
d9dbea1836 move mask and draw settings into its own struct to be shared between spaces. 2012-07-24 20:33:55 +00:00
f7a1819559 svn merge ^/trunk/blender -r49167:49175 2012-07-24 12:38:37 +00:00
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
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
23c4026c3f warn when getting a context member fails because of type mismatch 2012-07-24 10:28:29 +00:00
7949f0057f generalize mask poll functions and sequencer mask code. 2012-07-24 09:53:29 +00:00
a0403fe2fb Merging r49149 through r49167 from trunk into soc-2011-tomato 2012-07-24 09:03:40 +00:00
Dalai Felinto
752e14ce15 no need for renaming actions that are not linked anywhere
talked with Joshua Leung (aligorith) and he agreed on that
2012-07-24 07:08:33 +00:00
ad4738e77f svn merge ^/trunk/blender -r49118:49143 2012-07-23 15:03:54 +00:00
161f502485 Fix for #32162 psys rotation causes size issues for particle instances
- The original scaling of the object wasn't taken into account when not using the particle dupliobject rotation option.
2012-07-22 23:07:43 +00:00
76bea854b6 code cleanup: replace cos(M_PI / 4) and sin(M_PI / 4) with M_SQRT1_2 define
also some minor style cleanup.
2012-07-22 18:40:50 +00:00
e58104c515 Bugfix [#32017] Infinite recursion in depsgraph material/node driver handling
When initially coding this functionality, I was aware of the potential for
infinite recursion here, just not how frequently such setups are actually
used/created out in the wild (nodetree.ma_node -> ma -> ma.nodetree is all too
common, and often even with several levels of indirection!).

However, the best fix for these problems was not immediately clear. Alternatives
considered included...
 1) checking for common recursive cases.  This was the solution employed for one
of the early patches committed to try and get around this. However, it's all too
easy to defeat these measures (with all the possible combinations of indirection
node groups bring).
 2) arbitrarily restricting recursion to only go down 2/3 levels? Has the risk
of missing some deeply chained/nested drivers, but at least we're guaranteed to
not get too bad. (Plus, who creates such setups anyway ;)
*3) using the generic LIB_DOIT flag (check for tagged items and not recurse down
there). Not as future-proof if some new code suddenly decides to start adding
these tags to materials along the way, but is easiest to add, and should be
flexible enough to catch most cases, since we only care that at some point those
drivers will be evaluated if they're attached to stuff we're interested in.
 4)  introducing a separate flag for Materials indicating they've been checked
already. Similar to 3) and solves the future-proofing, but this leads to...
 5) why bother with remembering to clear flags before traversing for drivers to
evaluate, when they should be tagged for evaluation like everything else?
Downside - requires depsgraph refactor so that we can actually track the fact
that there are dependencies to/from the material datablock, and not just to the
object using said material. (i.e. Currently infeasible)
2012-07-22 16:14:57 +00:00
919a848015 svn merge ^/trunk/blender -r49107:49118 2012-07-22 16:10:06 +00:00
9b51503307 style cleanup 2012-07-21 22:58:08 +00:00
7baf3d2ece svn merge ^/trunk/blender -r49082:49104 2012-07-21 15:40:47 +00:00
62a73381a7 use fabsf when using floats. 2012-07-21 15:27:40 +00:00
1bb7cfded6 Merge mask fixes from tomato branch
--
svn merge -r49075:49076 -r49086:49087  ^/branches/soc-2011-tomato
2012-07-21 09:01:39 +00:00
3b012c041f Merged changes in the trunk up to revision 49090. 2012-07-20 23:12:05 +00:00
Lukas Toenne
44800e884c Masking: prevent crashes in cases when mask spline is axis aligned 2012-07-20 17:28:42 +00:00
8568ce6fc8 Mask rasteriyer: fixed wrong bounding box calculation
for non-cyclic splines
2012-07-20 10:35:46 +00:00