Commit Graph

40050 Commits

Author SHA1 Message Date
Sergey Sharybin
4d92a00ca4 Merging r48889 through r48893 from trunk into soc-2011-tomato 2012-07-13 14:21:17 +00:00
Sergey Sharybin
807ad1f0e0 Fix #32087: Crash while changing values in comp editor (bt and blender included)
Issue was caused by threading conflict between compositor output node which
is freeing buffers used by render result image and image draw code which
could use buffers at the same time as compositor frees this buffers.

Solved by adding adding  lock around viewer image invalidation and image
drawing.

Use renamed LOCK_PREVIEW mutex for this, which si not called LOCK_DRAW_IMAGE.
With new compositor locking for preview is not needed so it could be removed.

Added the same lock around viewer operation which also frees buffers used
by viewer image. It's actually quite difficult to check whether this is
indeed needed. This code seems to be using acquire/release technique, but
somehow acquiring ImBuf before invalidating it in compositor operation
doesn't resolve the issue, so probably it's not actually locking acquire
and things should be checked deeper.
2012-07-13 13:47:13 +00:00
Campbell Barton
a5e6d73d41 fix for crash with new rasterizer 2012-07-13 12:55:30 +00:00
Jeroen Bakker
6eacb5791d Inner loop optimization of blur node 2012-07-13 12:50:10 +00:00
Jeroen Bakker
9987a8fca7 Removed parameter from executePixel and initializeTileData. 2012-07-13 12:24:42 +00:00
Campbell Barton
ef18a792c2 svn merge ^/trunk/blender -r48868:48888 2012-07-13 12:06:31 +00:00
Campbell Barton
bccd5380f5 speedup - because we know triangles will always have the same z value. 2012-07-13 12:03:53 +00:00
Campbell Barton
a3cf6da7ae temp disable quad interpolation 2012-07-13 11:48:30 +00:00
Campbell Barton
3fe14a962a masking - add feather faces as quads and interpolate as quads to avoid ugly diagonal lines. 2012-07-13 09:22:58 +00:00
Campbell Barton
73c2abe83d new function barycentric_weights_v2_quad(), like barycentric_weights_v2 but for quads.
takes vecs and a point and assigns 4 weights, needed for nice quad interpolation for mask feathering.
2012-07-13 09:19:05 +00:00
Dalai Felinto
6ee2e0b145 bugfix: [#32073] Displace node different result between Low and high quality 2012-07-13 06:07:28 +00:00
Campbell Barton
8ce53a2a98 new mask rasterizer written to take advantage of the compositors threading, mostly functional but disabled by default (still a little wip). 2012-07-12 20:10:41 +00:00
Jeroen Bakker
8809f23c8d Missed H file 2012-07-12 19:48:16 +00:00
Jeroen Bakker
8b8bc164da Small optimizations in compositor.
Most of them are not noticeable.
2012-07-12 19:19:03 +00:00
Sergey Sharybin
bb09f856df Merging r48862 through r48868 from trunk into soc-2011-tomato 2012-07-12 17:19:54 +00:00
Thomas Dinges
2738fa99e7 3D View / Edges menu:
* Removed a redundant "Edge Crease" entry and some code cleanup.
2012-07-12 16:19:29 +00:00
Sergey Sharybin
152675db1a Fix #31988: VBOs Textured solid : no update of material in 3Dview
Issue was caused by VBOs using CD_TEXTURE_MCOL for faces colors. This
layer was creating on mesh display (from draw_tface_mapped__set_draw)
in cases there's no such a layer.

If material settings are changing, this layer wasn't updated and old
colors were used.

Fixed by performing an update of this layer in cases it's already
exists. This would give some % of slowdown, but don't think it'll
be dramatically bad.

Would be nice to find a nice way to update such a layer in cases
material is actually changes only, or get completely rid of it/
2012-07-12 16:08:22 +00:00
Sergey Sharybin
ba44250a23 Fix #32067: since BMesh, files < 2.59.3 no longer have their texface converted
Issue was caused by performing conversion from FTFaces to materials from
the end of lib_link_mesh, where tesselated faces were cleared already.

This conversion can't be switched to BMesh structures because in future
MTexPolys could be changed in a way, that versioning stuff wouldn't work
any more. Another issue is that making such a conversion per-mesh would
lead to quite a code spagetti, which is difficult to follow.

Solved by splitting per-mesh cycle in lib_link_mesh, so now it consists
of three steps:

- Do linking stuff such as custom data layers, materials. Perform a
  Conversion stuff like tessface -> polys.

- Convert all MTFaces to materials. This conversion handles all meshes
  and creates needed materials.

- Free tessfaces, mark mesh as linked.

Such a separation shouldn't noticeably affect on speed of linking.
2012-07-12 15:36:22 +00:00
Lukas Toenne
18d7a23166 Fix #32051, Ungroup operator crashes. The link iterator can be invalidated when unconnected input links are removed. 2012-07-12 15:14:50 +00:00
Sergey Sharybin
126024e537 Fix #31584: Fractional step in value input for Skin Modifier (Event/input problem)
Issue was caused by the code which checked whether snapping should be enabled
on transform init taking into account keymap and special keys state. It was
used for Ctrl-Click on manipulator only.

Check for Ctrl state gave wring result with skin modifier. It was solved
by additional check for which mode transformation is initializing for --
currently manipulator is available for translation/roation/resize only
which doesn't give any keymap issues.
2012-07-12 14:41:52 +00:00
Sergey Sharybin
8764e7507f Merging r48829 through r48861 from trunk into soc-2011-tomato 2012-07-12 12:12:21 +00:00
Sergey Sharybin
8ef23c6743 Clip editor mode selection: show menu with modes on TAB
This seems to be the only straightforward way to switch fast between
modes without keeping bunch of shortcuts and current mode in head.
2012-07-12 12:06:40 +00:00
Sergey Sharybin
5a878c50eb Fixed issue with drag-n-drop into Clip Editor. 2012-07-12 11:52:09 +00:00
Jens Verwiebe
30b3907128 OSX: make the progressbar in dock a gradient, to give it a more matching 3D appearance 2012-07-12 11:35:51 +00:00
Sergey Sharybin
ddf7d364e9 Fix for metaballs used as dupli-object for particle
It used to be a dependency cycle which lead to incorrect or
missed tesselation on some circumstances.

Seems to be introduced in rev41627.

This commit seems to behaving properly on simple cases,
probably could fail in some other cases, so need to be
checked further.

Discovered when was looking into:
    #32034: Metaball used as render object(group) for particle will display wire only.
2012-07-12 11:22:46 +00:00
Sergey Sharybin
f7f216262d Fix #32041: Empty display size is not taken into account for centering view 2012-07-12 10:27:22 +00:00
Sergey Sharybin
c86d31cc55 Fix #32050: UV map and game engine property cause crash 2012-07-12 09:56:18 +00:00
Campbell Barton
38f91db37c add bli rect min/max functions. 2012-07-12 09:24:17 +00:00
Campbell Barton
c8d29b1996 feather points now align with mask outline when called with same resolution. 2012-07-12 09:03:45 +00:00
Campbell Barton
2560725807 - add a temp var for edge scanfill (fits in 4 bytes alignment - won't increase mem usage)
- make keyindex an unsigned int, since its used to store vertex indices
- use BLI_in_rcti_v for IN_2D_VERT_SCROLL and IN_2D_HORIZ_SCROLL
2012-07-12 08:34:59 +00:00
Campbell Barton
993dfd7d2a add bli rect funcs BLI_rctf_init_minmax, BLI_rcti_init_minmax 2012-07-12 08:31:23 +00:00
Sergey Sharybin
92119982cb Fix #32082: face textures lost when linking scene from another file
Issue was caused by missing expand for MTexPoly-s tpages.
2012-07-12 07:30:50 +00:00
Sergey Sharybin
54c5edcfbb Fix crash on creating tooltip for sequencer's gl preview mode
Issue was caused by missed value for this enum, fixed by adding check
in tooltip generation.

Default value for this enum should also be fixed, but that would be
in separated commit.
2012-07-12 07:15:32 +00:00
Nicholas Bishop
677876e429 Fix normals around root nodes of skin modifier output.
The direction for these are flipped from other end caps, so add a root
flag to indicate whether the cap polygon's vertex output order should be
reversed.

Fixes bug [#32079] Skin-modifier calculates root's normals wrong
projects.blender.org/tracker/index.php?func=detail&aid=32079&group_id=9&atid=498
2012-07-12 05:55:07 +00:00
Thomas Dinges
4f5d982fb1 Readme and Release Log Links:
* Update to 2.64
2012-07-11 21:57:11 +00:00
Thomas Dinges
fabc2322aa Fix for [#32078] Rendering output to Frame Server is broken.
* BKE_frameserver_append() always returned 0, which caused the frameserver to crash after the first frame was requested. Patch by "alas2718"
2012-07-11 21:42:06 +00:00
Thomas Dinges
36f6bf98d5 Node Editor / Cycles:
* Typo fix for new Blend mode.
2012-07-11 21:39:04 +00:00
Jeroen Bakker
4fb850c72e Compositor:
re-optimized the Defocus node.
 * localized MemoryBuffers
 * removed read(x,y) calls
 * shuffled some lines in the execute pixel
 * added a readNoCheck function to the memorybuffer (only use this when
you are certain you are reading a pixel inside the memorybuffer.
2012-07-11 20:51:00 +00:00
Campbell Barton
83d2314edf ability to calculate mask curve and feather with predefined resolution (*_ex functions) 2012-07-11 20:18:46 +00:00
Sergey Sharybin
ba4a5ff74f Color management support for sequencer
This adds color management controls to the sequencer space,
which are applying on the displaying image.

Currently used the same UI approach as was used for other
areas, but this would probably be cleaned up in the nearest
future.

This required a bit of hackish stuff to be done, Namely color
management for the sequencer requires one extra step in the
conversion chain to convert sRGB float buffer to linear space.
This was made by setting special flag in ImBuf. Later this
could be done using input color space for the ImBuf probably.
2012-07-11 19:39:43 +00:00
Jeroen Bakker
b63b8ea69d Compositor:
Added OpenCL kernel for the directional blur.

This operation always uses the full input image. In the current
implementation this input image is not cached on the device.

Future enhancement could be to cache it on the available opencl devices
2012-07-11 19:32:32 +00:00
Sergey Sharybin
5aa2670d4a Fix mistmatched new[] and dlete used in node highlightion 2012-07-11 18:46:27 +00:00
Campbell Barton
a5127dba57 vector versions of BLI_in_rctf / BLI_in_rcti, (BLI_in_rctf_v, BLI_in_rcti_v)
use where possible.
2012-07-11 18:17:48 +00:00
Lukas Toenne
2070cd5d49 Fix #32058, Crash when using ParticleInstance with an hidden particle system.
The instance modifier needs to access the derived mesh data of the particle parent object to create stuff on the hairs, however the dm does not exist when the particle modifier is hidden. This is a general design problem: Objects accessing another object's derived mesh data is unsafe. For now it just checks valid dm pointer and uses identity transform if NULL.
2012-07-11 16:08:04 +00:00
Sergey Sharybin
a87051bd8e Patch #32074: Fix compilation with boost 1.50
This patch switches from boost's filesystem v2 to v3.

This should be completely smooth due to filesystem v3 is pretty
old already.

Patch by Sven-Hendrik Haase (aka svenstaro), thanks!
2012-07-11 14:48:47 +00:00
Sergey Sharybin
ecfa1965da Use color management settings form the current window when
duplicating area to new window.
2012-07-11 12:51:06 +00:00
Campbell Barton
81829f5221 code cleanup: use const for passing vectors 2012-07-11 12:42:02 +00:00
Campbell Barton
7620c27554 missed this change from patch [#30274] 2012-07-11 12:35:50 +00:00
Sergey Sharybin
70ccdc6daa Style cleanup 2012-07-11 11:31:14 +00:00
Jeroen Bakker
c25240ad54 Compositor read buffers work directly on the memory buffer.
This way we can remove the memoryBuffers parameter in the executePixels,
and (de)initializeTileData methods
2012-07-11 10:45:56 +00:00