Commit Graph

47594 Commits

Author SHA1 Message Date
a8fe0087f0 Merging r48826 through r48828 from trunk into soc-2011-tomato 2012-07-11 10:39:08 +00:00
6e6dd576a8 Operator to move mask layers up and down in the list 2012-07-11 10:37:38 +00:00
605e916777 Merging r48813 through r48825 from trunk into soc-2011-tomato 2012-07-11 07:49:08 +00:00
4e213765ec Fixes for keying screen:
- Fixed issue with black areas appearing when too many sites
  are defined.

  Currently tweak epsilon value for this, but probably actual
  issue is somewhere else, can't see it yet.

- Fixed issue with bright pixels appearing in the sites, was
  caused by accumulating color for pixels, which isn't needed.

  Once color for pixel was set stop iterating via triangles.
  Could give some speedup too.

- Ignore markers which are outside of frame bounds, they were
  giving bad triangulation and they can't affect on gradient
  due to color fir such sites is not known.

- Sites used to be created at position without track offset
  taken into account.
2012-07-11 07:46:36 +00:00
26f6913516 Cycles: blended box mapping support for image texture node. This enabled by
selecting Box instead of Flat as projection, and then setting the blend value.
Blend 0.0 will not do any blending between box sides, higher values will give
a smooth transition between the sides

This is useful for mapping image texture without too obvious patterns in a
way that looks seamless, without the need for UV mapping. This works basically
the same as the mango node setup that was posted, just a bit faster:

http://mango.blender.org/production/blended_box/
2012-07-11 00:08:42 +00:00
315698543b Fix for issue [#31981] for tiles opencl:
initialize radius with correct value
2012-07-10 20:46:42 +00:00
9c464ee2bb improved node frame text alignment and use default label font (not monospaced) 2012-07-10 20:44:25 +00:00
e8e8ceaea2 fix for Tiles bug - opencl:
[#31981] Bokeh Blur Node - Size input socket does not accept input from Value Input node, Values smaller than 0.1 will produce black output
2012-07-10 20:33:24 +00:00
8a4584d04d Fix for tiles bug:
[#31981] Bokeh Blur Node - Size input socket does not accept input from Value Input node, Values smaller than 0.1 will produce black output
2012-07-10 20:21:13 +00:00
831ae18622 Scaling non-power-of-two (NPOT) textures to powers of two is really time consuming and not necessary on graphics cards that can support NPOT textures. So, if the graphics card has NPOT texture support, don't bother scaling. If this patch causes issues, it can always be reverted and applied to Swiss instead. 2012-07-10 19:23:57 +00:00
6f6471a864 Merging r48810 through r48812 from trunk into soc-2011-tomato 2012-07-10 15:47:39 +00:00
f279576f1a Bump Blender version, so despill balance would stay untouched in
rare cases when it was intentionally set to 0.
2012-07-10 15:35:25 +00:00
82277eb766 Make grumpy gcc in "overwarning" mode happy again... 2012-07-10 15:28:32 +00:00
09950681cc Merging r48803 through r48809 from trunk into soc-2011-tomato 2012-07-10 14:56:55 +00:00
ba8154e24a Keying screen: small fixes and improvements from tomato
- Fixed issues with calculating matte with balance != 0.5
  It used to be used concave combination of minimal and maximal
  channel values which could be inpredictable.
  Use concave combination of two non-major channels sorted
  by their index, so such combination would always use the same
  coefficients for particular non-major channels.

- Added despill balance slider which defines balance between
  non-major channels used for calculating average of two
  colors. Difference between average value and pixel value of
  major screen channel defines amount of despill. Balance of
  0.5 gives the same behavior as it was before this slider
  was added.

---
svn merge -r48678:48679 -r48789:48790 ^/branches/soc-2011-tomato
2012-07-10 14:53:36 +00:00
76ee9783a1 Improved cache management for movie clips from tomato branch
Replace pseudo-LRU approach of determining which buffer
to remove when running out of space allowed for cache
with approach which would remove the frame which is most
far away from newly added frame.

This is still a bit tricky because it's impossible to
distinguish which frame to delete in situation of:

        CCCC...CC
           ^

it's either user wants to extend left segment of cached
frames and buffers from right segment should be removed
or he wants to join this two segments and in that case
buffers from right segment should be removed.

Would need a bit more investigation which situation
is more common in general usecase.

Additional changes:

- Cleanup some memutil files (which are familiar to cache limiter)

- Add option to make moviecache verbose. If DEBUG_MESSAGES is
  defined in moviecache.c detailed logs would be printed to the
  console.

- Movie caches are now named which helps reading debug messages.
2012-07-10 14:43:50 +00:00
a41dc719bf Movie Clip Node: skip putting frame to cache when rendering animation
This helps keeping memory usage low and have cached segments untouched
when mixing stuff like tracking and rendering -- now you wouldn't be
need to re-cache segment you're working on after rendering.

---
svn merge -r48550:48552 ^/branches/soc-2011-tomato
2012-07-10 14:42:37 +00:00
Lukas Toenne
21f81ee279 Fix for center calculation in node transforms. This now uses the actual barycenter of node rect centers. 2012-07-10 13:50:51 +00:00
2de2b7eba8 Synchronize style cleanup changes made in tomato branch 2012-07-10 13:41:21 +00:00
350518483d Code cleanup, typo fixes 2012-07-10 13:40:09 +00:00
b8979b69c4 Merging r48794 through r48802 from trunk into soc-2011-tomato 2012-07-10 13:24:29 +00:00
165e8b0155 Fix compilation error when using MSVC 2012-07-10 12:57:09 +00:00
1360147e9e Tag ununsed variable and make function real explicit prototype. 2012-07-10 12:42:03 +00:00
dc65a26bf6 refactor node highlight code. New implementation will not write to
uninitialized memory. it happened when you delete a node that was being
executed. in the compostor
2012-07-10 12:23:49 +00:00
5cc0e5f751 Mango request: added an input node to use track's position in compositor
--
svn merge -r48088:48089 -r48091:48092 ^/branches/soc-2011-tomato
2012-07-10 11:01:25 +00:00
5b57f38fb5 Mango request: option to clamp result of Mix RGB and Color Math nodes
---
Merging r48792 from soc-2011-tomato into trunk
2012-07-10 10:36:18 +00:00
a158cb4e69 Mango request: disable compositing on file load.
This does not make much sense and just annoys in most of cases.

---
Merging r48793 from soc-2011-tomato into trunk
2012-07-10 10:31:05 +00:00
276f07f409 dont draw 3d viewport while rendering, mango hack 2012-07-10 10:18:20 +00:00
0a4f8d0e7f Merging r48755 through r48793 from trunk into soc-2011-tomato 2012-07-10 10:11:54 +00:00
Lukas Toenne
80867d76e5 Fix #32052, Conflicts in unique node names.
All node group operators which move nodes directly between bNodeTree->nodes lists now make sure the node names are indeed unique in their new environment (the node group tree or the parent tree).
2012-07-10 09:31:08 +00:00
6b75a99c01 Tomato mango request: do not start compositing on file load 2012-07-10 09:12:39 +00:00
717ac64cb1 Tomato: added option to clamp result of Mix RGB and Color Math nodes 2012-07-10 09:12:33 +00:00
63ad458dba Tomato: fix typos in mask maps used for raster cache 2012-07-10 09:12:21 +00:00
3b35396576 Tomato: fix wrong default value for despill balance 2012-07-10 09:12:17 +00:00
e343f7f320 Inline the read Memory Buffer functions for speed optimizations. 2012-07-10 06:31:16 +00:00
492d9aabe0 some code refactors in raskter.c to sync it with build where mask tiling is being developed. Also adds a bit more mask tiling code. 2012-07-10 04:51:08 +00:00
1f9adff26f Fix for a crash caused by ReplaceMesh changing an objects physics shape. CcdShapeConstructionInfo::UpdateMesh() would change the CcdShapeConstructionInfo's m_meshObject, but didn't change m_meshShapeMap, which means the CcdShapeConstructionInfo object's destructor would not find it's m_meshObject in the m_meshShapeMap. This leaves some nasty dangling pointers laying around which caused issues if the scene was re-run, or the scene was changed to one that also had the mesh.
Note: This fix could cause other issues with shared physics meshes. In general, we may want to re-evaluate how we handle updating potentially shared physics meshes.
2012-07-10 02:05:06 +00:00
565f10a541 center node group text button vertically 2012-07-09 23:23:47 +00:00
0b1d5d42cf style cleanup: line length, also comment some unused code 2012-07-09 23:07:15 +00:00
689403bf57 updating raskter to support tiles compositor. this commit puts in some groundwork code to support tiles's pixel processor 2012-07-09 22:57:23 +00:00
f3fa96303b Fixed an exception during image export when a source image does not exist in the file system 2012-07-09 22:41:44 +00:00
24f672d57b fix for blender naming all new node groups "Missing Datablock" 2012-07-09 22:39:35 +00:00
df107939c9 rename BLI_getQuotedStr --> BLI_str_quoted_substrN to make it more clear its doing an allocation. 2012-07-09 22:16:50 +00:00
3c0579afc5 Removed unneeded variable from Image Exporter 2012-07-09 21:57:04 +00:00
954d2a9b31 style cleanup: missed previous commit 2012-07-09 20:37:09 +00:00
7783b458ad And arabic is over 60% done too, now! :) 2012-07-09 20:02:30 +00:00
62df28a325 style cleanup: node drawing 2012-07-09 19:58:36 +00:00
e66a02e7e2 improve node text alignment with different zoom levels 2012-07-09 19:50:43 +00:00
a40c367a35 BGE: Fixing up the error message received when trying to add an object from an active layer. 2012-07-09 18:55:50 +00:00
6665cf4cde code cleanup: remove pointless casts (int -> short -> int) 2012-07-09 17:05:47 +00:00