Commit Graph

11497 Commits

Author SHA1 Message Date
371e259a0b svn merge ^/trunk/blender -r49037:49061 2012-07-19 10:29:39 +00:00
250cdd5e52 code cleanup: remove commented includes - mostly from 2.4x 2012-07-18 23:07:07 +00:00
9d79d2bee8 svn merge ^/trunk/blender -r49029:49035 2012-07-18 16:26:07 +00:00
c8029bffd9 workaround for a bug with zero edges getting removed got feather faces out of sync and crashed 2012-07-18 16:24:13 +00:00
c0e004bd61 add difference blending mode, also fix error in last commit 2012-07-18 13:44:48 +00:00
73a778a4d0 change bucket size to give better performance for high detail 4k masks, also clamp from 0-1 for each layer when accumulating. 2012-07-18 13:34:14 +00:00
6dc50955d7 svn merge ^/trunk/blender -r49024:49029 2012-07-18 12:56:36 +00:00
cfb3194945 code cleanup for mask capping 2012-07-18 12:54:13 +00:00
61ef13752d chance semi-circle mask capping resolution based on size. 2012-07-18 12:45:20 +00:00
eceec8856d minor edits to mask rasterizer. 2012-07-18 12:17:12 +00:00
1f66c7eeca Merging r49020 through r49024 from trunk into soc-2011-tomato 2012-07-18 11:49:18 +00:00
e80918604a Fixed wrong self-intersection check for non-closed splines 2012-07-18 11:48:13 +00:00
8f32070e9d fix incorrect assert for mask face checking, also correct own bad spelling 2012-07-18 11:01:23 +00:00
3878f45be6 Merging r49005 through r49019 from trunk into soc-2011-tomato 2012-07-18 10:24:47 +00:00
c05af6210e Fixed crash of self-intersection loop in special cases
It was wrongly calculated bucket number per side in cases when some
of segments is filling the whole bounding box across some of dimension.

Solved by limiting buckets at least to 1 in such cases.
2012-07-18 10:22:56 +00:00
88fddb3cc3 make links now allows groups - this means you can make objects have matching groups to the active more easily. 2012-07-18 09:45:50 +00:00
7baa8d5203 mask rasterizer unfilled line end capping now works with aspect and blending. 2012-07-17 20:40:12 +00:00
b6a9ffffed wip mask capping - works but needs aspect correction and to be faded out. 2012-07-17 20:01:01 +00:00
d2eed9a64f Merging r49003 through r49004 from trunk into soc-2011-tomato 2012-07-17 16:26:38 +00:00
2c2e1775f9 Feather self-intersection test speed up
Made some minor optimization such as:

- Avoid using "%" operation in loops, replace with a check
  for index "overflow".
- Use pre-computed values for scaling feather coordinates
  to 0 .. 1 space.

This allowed to reach couple of milliseconds of boost.

Another change is to use higher number of buckets (up to 512).
This doesn't took significantly more memory (like uses only 10MB
of memory for average splines) and allows to have 30-50x boost
for average splines.

Use dynamically calculated number of buckets for this, to be
sure segments would fit two buckets.

Also fixed intersection detection in some cases when edge is
shared between two buckets -- it is possible that such edge
would cross third bucket and intersect edge from there.
2012-07-17 16:22:18 +00:00
573c373bab svn merge ^/trunk/blender -r48995:49000 2012-07-17 15:18:02 +00:00
9c714f695a fix for particle system using uninitialized stack memory with midpoint of rk4 integrators. 2012-07-17 13:28:30 +00:00
6f0950a1f4 use math vector init functions 2012-07-17 12:05:15 +00:00
8f85e93ea6 Color management: fix missed color management settings for new created scenes
- Initialize color management settings if creating new scene
- Copy settings from active scene if creating with copying settings
  or if using other copy/link object settings

This also should fix issue with Export UV Layout operator
2012-07-17 11:10:40 +00:00
c415a01fea Merging r48992 through r48995 from trunk into soc-2011-tomato 2012-07-17 10:46:32 +00:00
e35d3083ec Fixed crash when rasterizing spline with only one point
It was an issue in new feather self-intersection test code.
2012-07-17 10:43:57 +00:00
43fede9519 svn merge ^/trunk/blender -r48986:48991 2012-07-17 09:58:20 +00:00
f4cff34392 disable feather collapse during drawing, its very slow. 2012-07-17 09:56:10 +00:00
32cf7fcdb1 code cleanup: spelling 2012-07-16 23:23:33 +00:00
1589454879 Merging r48985 through r48986 from trunk into soc-2011-tomato 2012-07-16 20:36:09 +00:00
4a6a3e2f98 Merging r48981 through r48984 from trunk into soc-2011-tomato 2012-07-16 19:24:25 +00:00
1f96470b5d Fixed disappearing in some circumstances feather
Real fix would be to find a point which is definitely now on loop
to be collapsed, but that's for a bit later. This commit should
remove possible stoppers.
2012-07-16 19:23:15 +00:00
5915b53350 Fixed crash caused by recent feather collapse commit 2012-07-16 18:34:57 +00:00
ba81b87ea4 Merging r48971 through r48980 from trunk into soc-2011-tomato 2012-07-16 17:58:23 +00:00
92205486e7 Masks: feather self-intersection collapse function
This implements simple function which collapses internal loops
caused by self-intersections into a singularity.

This loops can't be removed because rasterizer expects points
of feather be aligned with points from spline itself.
2012-07-16 17:54:28 +00:00
3a039d0e10 Put paint mask grid allocation in a critical section
When OpenMP is enabled, memory allocation needs to be protected.

Fixes bug [#32111] Memory management regression from svn_46520
projects.blender.org/tracker/index.php?func=detail&aid=32111&group_id=9&atid=498
2012-07-16 16:55:58 +00:00
7881d2c1a8 correct own error in logic for skipping mask layers, inverted mask layers with zero alpha still need to be evaluated. 2012-07-16 15:40:47 +00:00
11276bca5c svn merge ^/trunk/blender -r48967:48970 2012-07-16 14:29:23 +00:00
f9e63430ac use calculated spline resoltion rather then fixed at 32. 2012-07-16 14:17:01 +00:00
7b3c9df572 svn merge ^/trunk/blender -r48961:48967 2012-07-16 13:13:27 +00:00
5b4a455569 defailt to ease weight interpolation 2012-07-16 13:12:52 +00:00
9362a01ff3 fix for crash & leak when layer render option is disabled. 2012-07-16 13:00:54 +00:00
f6b3a6e6f3 fix for occasional crash with splines a lot larger then the view 2012-07-16 12:49:01 +00:00
e32d963478 mask rasterizer - use quad interpolation - gets rid of ugly diagonal banding, introduces glitch with bowtie quads, will have to fix next. 2012-07-16 12:08:28 +00:00
4907f7c7e8 Merging r48954 through r48961 from trunk into soc-2011-tomato 2012-07-16 11:06:26 +00:00
0d37f82c9b Color management: support of configurable input color space
This adds a user-defined input color space name for image and
movie clip data blocks. Support for this thing for other data
blocks is still a TODO.

Input color space is being used on loading file to convert
loaded image buffer from this space to scene linear space,
later this space is never used in a pipeline.

Color space name was wrapped into own structure like it's
done for display and view settings. This helps keep code
de-duplicated in RNA and it'll help when likely more options
are added into input color space settings (i.e. flag whether
image could be color managed or it's a non-color data).

This implied quite of internal refactoring:

- Made routines around threaded display buffer calculation
  more general, so any kind of color transform could be
  performed using the same technique.

- Added function to convert given float buffer from given
  input color space to output color space. This is a public
  function which could be used in such a things as compositor
  node.

- Added function to convert ImBuf's content to scene linear
  space. Currently used only for images and clips. Should be
  added to any image/movie-related data blocks such as
  sequencer strips, but that a bit more long-term plan.

- If input color space is set to NONE then no buffer transform
  would be performed on image loading. It'll behave in the same
  way as using scene linear as input space.
2012-07-16 10:50:53 +00:00
a2e2489f61 correct own naming error BLI -> BKE 2012-07-16 08:53:11 +00:00
284d9422f4 svn merge ^/trunk/blender -r48937:48953 2012-07-16 08:48:06 +00:00
60cfbaeb1e mask blending modes: lighten/darken/multiply/replace 2012-07-16 07:23:16 +00:00
8e7aa50021 fix crash for empty or single vertex layers. 2012-07-16 07:04:10 +00:00