9 years agoBump Blender version, so despill balance would stay untouched in
Sergey Sharybin [Tue, 10 Jul 2012 15:35:25 +0000 (15:35 +0000)]
Bump Blender version, so despill balance would stay untouched in
rare cases when it was intentionally set to 0.

9 years agoMake grumpy gcc in "overwarning" mode happy again...
Bastien Montagne [Tue, 10 Jul 2012 15:28:32 +0000 (15:28 +0000)]
Make grumpy gcc in "overwarning" mode happy again...

9 years agoKeying screen: small fixes and improvements from tomato
Sergey Sharybin [Tue, 10 Jul 2012 14:53:36 +0000 (14:53 +0000)]
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

9 years agoImproved cache management for movie clips from tomato branch
Sergey Sharybin [Tue, 10 Jul 2012 14:43:50 +0000 (14:43 +0000)]
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:


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

- Movie caches are now named which helps reading debug messages.

9 years agoMovie Clip Node: skip putting frame to cache when rendering animation
Sergey Sharybin [Tue, 10 Jul 2012 14:42:37 +0000 (14:42 +0000)]
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

9 years agoFix for center calculation in node transforms. This now uses the actual barycenter...
Lukas Toenne [Tue, 10 Jul 2012 13:50:51 +0000 (13:50 +0000)]
Fix for center calculation in node transforms. This now uses the actual barycenter of node rect centers.

9 years agoSynchronize style cleanup changes made in tomato branch
Sergey Sharybin [Tue, 10 Jul 2012 13:41:21 +0000 (13:41 +0000)]
Synchronize style cleanup changes made in tomato branch

9 years agoFix compilation error when using MSVC
Sergey Sharybin [Tue, 10 Jul 2012 12:57:09 +0000 (12:57 +0000)]
Fix compilation error when using MSVC

9 years agoTag ununsed variable and make function real explicit prototype.
Sergey Sharybin [Tue, 10 Jul 2012 12:42:03 +0000 (12:42 +0000)]
Tag ununsed variable and make function real explicit prototype.

9 years agorefactor node highlight code. New implementation will not write to
Jeroen Bakker [Tue, 10 Jul 2012 12:23:49 +0000 (12:23 +0000)]
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

9 years agoMango request: added an input node to use track's position in compositor
Sergey Sharybin [Tue, 10 Jul 2012 11:01:25 +0000 (11:01 +0000)]
Mango request: added an input node to use track's position in compositor

svn merge -r48088:48089 -r48091:48092 ^/branches/soc-2011-tomato

9 years agoMango request: option to clamp result of Mix RGB and Color Math nodes
Sergey Sharybin [Tue, 10 Jul 2012 10:36:18 +0000 (10:36 +0000)]
Mango request: option to clamp result of Mix RGB and Color Math nodes

Merging r48792 from soc-2011-tomato into trunk

9 years agoMango request: disable compositing on file load.
Sergey Sharybin [Tue, 10 Jul 2012 10:31:05 +0000 (10:31 +0000)]
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

9 years agoFix #32052, Conflicts in unique node names.
Lukas Toenne [Tue, 10 Jul 2012 09:31:08 +0000 (09:31 +0000)]
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).

9 years agoTomato mango request: do not start compositing on file load
Sergey Sharybin [Tue, 10 Jul 2012 09:12:39 +0000 (09:12 +0000)]
Tomato mango request: do not start compositing on file load

9 years agoTomato: added option to clamp result of Mix RGB and Color Math nodes
Sergey Sharybin [Tue, 10 Jul 2012 09:12:33 +0000 (09:12 +0000)]
Tomato: added option to clamp result of Mix RGB and Color Math nodes

9 years agoTomato: fix typos in mask maps used for raster cache
Sergey Sharybin [Tue, 10 Jul 2012 09:12:21 +0000 (09:12 +0000)]
Tomato: fix typos in mask maps used for raster cache

9 years agoTomato: fix wrong default value for despill balance
Sergey Sharybin [Tue, 10 Jul 2012 09:12:17 +0000 (09:12 +0000)]
Tomato: fix wrong default value for despill balance

9 years agorename raskter kdtree files to be less generic
Campbell Barton [Tue, 10 Jul 2012 06:47:21 +0000 (06:47 +0000)]
rename raskter kdtree files to be less generic

9 years agoInline the read Memory Buffer functions for speed optimizations.
Jeroen Bakker [Tue, 10 Jul 2012 06:31:16 +0000 (06:31 +0000)]
Inline the read Memory Buffer functions for speed optimizations.

9 years agofix: inline to __inline in raskter.c for msvc
Peter Larabell [Tue, 10 Jul 2012 05:16:43 +0000 (05:16 +0000)]
fix: inline to __inline in raskter.c for msvc

9 years agosome code refactors in raskter.c to sync it with build where mask tiling is being...
Peter Larabell [Tue, 10 Jul 2012 04:51:08 +0000 (04:51 +0000)]
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.

9 years agoFix for a crash caused by ReplaceMesh changing an objects physics shape. CcdShapeCons...
Mitchell Stokes [Tue, 10 Jul 2012 02:05:06 +0000 (02:05 +0000)]
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.

9 years agocenter node group text button vertically
Campbell Barton [Mon, 9 Jul 2012 23:23:47 +0000 (23:23 +0000)]
center node group text button vertically

9 years agofix warnings/errors in recent raster commit.
Campbell Barton [Mon, 9 Jul 2012 23:16:39 +0000 (23:16 +0000)]
fix warnings/errors in recent raster commit.

9 years agostyle cleanup: line length, also comment some unused code
Campbell Barton [Mon, 9 Jul 2012 23:07:15 +0000 (23:07 +0000)]
style cleanup: line length, also comment some unused code

9 years agoupdating raskter to support tiles compositor. this commit puts in some groundwork...
Peter Larabell [Mon, 9 Jul 2012 22:57:23 +0000 (22:57 +0000)]
updating raskter to support tiles compositor. this commit puts in some groundwork code to support tiles's pixel processor

9 years agoFixed an exception during image export when a source image does not exist in the...
Gaia Clary [Mon, 9 Jul 2012 22:41:44 +0000 (22:41 +0000)]
Fixed an exception during image export when a source image does not exist in the file system

9 years agofix for blender naming all new node groups "Missing Datablock"
Campbell Barton [Mon, 9 Jul 2012 22:39:35 +0000 (22:39 +0000)]
fix for blender naming all new node groups "Missing Datablock"

9 years agorename BLI_getQuotedStr --> BLI_str_quoted_substrN to make it more clear its doing...
Campbell Barton [Mon, 9 Jul 2012 22:16:50 +0000 (22:16 +0000)]
rename BLI_getQuotedStr --> BLI_str_quoted_substrN to make it more clear its doing an allocation.

9 years agoRemoved unneeded variable from Image Exporter
Gaia Clary [Mon, 9 Jul 2012 21:57:04 +0000 (21:57 +0000)]
Removed unneeded variable from Image Exporter

9 years agostyle cleanup: missed previous commit
Campbell Barton [Mon, 9 Jul 2012 20:37:09 +0000 (20:37 +0000)]
style cleanup: missed previous commit

9 years agoAnd arabic is over 60% done too, now! :)
Bastien Montagne [Mon, 9 Jul 2012 20:02:30 +0000 (20:02 +0000)]
And arabic is over 60% done too, now! :)

9 years agostyle cleanup: node drawing
Campbell Barton [Mon, 9 Jul 2012 19:58:36 +0000 (19:58 +0000)]
style cleanup: node drawing

9 years agoimprove node text alignment with different zoom levels
Campbell Barton [Mon, 9 Jul 2012 19:50:43 +0000 (19:50 +0000)]
improve node text alignment with different zoom levels

9 years agoSmall cleanup...
Bastien Montagne [Mon, 9 Jul 2012 19:33:25 +0000 (19:33 +0000)]
Small cleanup...

9 years agoBGE: Fixing up the error message received when trying to add an object from an active...
Mitchell Stokes [Mon, 9 Jul 2012 18:55:50 +0000 (18:55 +0000)]
BGE: Fixing up the error message received when trying to add an object from an active layer.

9 years agocode cleanup: remove pointless casts (int -> short -> int)
Campbell Barton [Mon, 9 Jul 2012 17:05:47 +0000 (17:05 +0000)]
code cleanup: remove pointless casts (int -> short -> int)

9 years agofix node drawing glitch where text alignment for output sockets would move the text...
Campbell Barton [Mon, 9 Jul 2012 16:51:08 +0000 (16:51 +0000)]
fix node drawing glitch where text alignment for output sockets would move the text X axis twice as much as it should have.

9 years agocorrection to last commit. aspect doesn't need to be calculated every time.
Campbell Barton [Mon, 9 Jul 2012 16:26:01 +0000 (16:26 +0000)]
correction to last commit. aspect doesn't need to be calculated every time.

9 years agoFix for #31962, changes image ignores correct aspect ratio. Made
Antony Riakiotakis [Mon, 9 Jul 2012 16:12:57 +0000 (16:12 +0000)]
Fix for #31962, changes image ignores correct aspect ratio. Made
unwrapper flush the correct aspect flag to mtpoly after unwrap. Faces
that have been unwrapped with correct aspect option will fix their
aspect each time a different image is assigned to them. I hope fix works
100%, I can't say that I really understood the bizarre aspect ratio

9 years agofix for ugly pixelated drawing of node frame text.
Campbell Barton [Mon, 9 Jul 2012 16:06:44 +0000 (16:06 +0000)]
fix for ugly pixelated drawing of node frame text.

9 years agoremoved depth aware defocus
Jeroen Bakker [Mon, 9 Jul 2012 15:21:43 +0000 (15:21 +0000)]
removed depth aware defocus
add blur to radius buffer

9 years agoUI translation from inside Blender UI: first part.
Bastien Montagne [Mon, 9 Jul 2012 14:25:35 +0000 (14:25 +0000)]
UI translation from inside Blender UI: first part.

This commit reshapes a bit runtime button info getter, by adding a new uiButGetStrInfo() which accepts a variable number of uiStringInfo parameters, and tries to fill them with the requested strings, for the given button (label, tip, context, RNA identifier, keymap, etc.). Currently used mostly by existing ui_tooltip_create(), and new UI_OT_edittranslation_init operator.

It also adds a few getters (to get RNA i18n context, and current language iso code).

Finally, it adds to C operators needed for the py ui_translation addon:
*UI_OT_edittranslation_init, which gathers requested data and launch the py operator.
*UI_OT_reloadtranslation, which forces a full reload of the whole UI translation (including rechecking the directory containing mo files).

For the first operator to work, it also adds a new user preferences path: i18n_branches_directory, to point to the /branch part of a bf-translation checkout.

9 years agosvn merge ^/trunk/blender -r48749:48754
Campbell Barton [Mon, 9 Jul 2012 12:57:04 +0000 (12:57 +0000)]
svn merge ^/trunk/blender -r48749:48754

9 years agofix/workaround for cycles crash packing bvh
Campbell Barton [Mon, 9 Jul 2012 12:55:16 +0000 (12:55 +0000)]
fix/workaround for cycles crash packing bvh

brecht - when you get time please look into this to see if the fix is ok.

9 years agoTomato: fix for mask cache
Sergey Sharybin [Mon, 9 Jul 2012 11:45:07 +0000 (11:45 +0000)]
Tomato: fix for mask cache

That used to be a threading issue when two different operations
were allowed to access the same mask's cache. Now use lock in
BKE_mask_rasterize_layers so that should work fine now.

9 years agoFixed issue with missed cache update when disabling movie clip channels
Sergey Sharybin [Mon, 9 Jul 2012 11:13:40 +0000 (11:13 +0000)]
Fixed issue with missed cache update when disabling movie clip channels

9 years agocode cleanup: move sequencer timecode into its own func.
Campbell Barton [Mon, 9 Jul 2012 10:55:41 +0000 (10:55 +0000)]
code cleanup: move sequencer timecode into its own func.

9 years agoMerging r48740 through r48749 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 9 Jul 2012 10:33:09 +0000 (10:33 +0000)]
Merging r48740 through r48749 from trunk into soc-2011-tomato

9 years agoFixed issues updating texture buffer used for clip editor frame display
Sergey Sharybin [Mon, 9 Jul 2012 10:26:01 +0000 (10:26 +0000)]
Fixed issues updating texture buffer used for clip editor frame display
when specific circumstances are met.

Mainly issue was caused by checking ImBuf pointers, which used to fail
when some post-processing flags are changed. This was caused by the
fact that freeing old ImBuf and allocating new one could lead to new
ImBuf have the same pointer as previous one, which confuses cache.

9 years agoAs a response to issue [#28483] "Enable/Disable Rigid Body actuator do nothing" repor...
Mitchell Stokes [Mon, 9 Jul 2012 04:57:21 +0000 (04:57 +0000)]
As a response to issue [#28483] "Enable/Disable Rigid Body actuator do nothing" reported by Jean-Francois Gallant (pyroevil), I'm adding preliminary support to enable and disable rigid body physics on dynamic objects. This is can be done via the Edit Object Actuator or through KX_GameObject.enableRigidBody() and KX_GameObject.disableRigidBody(). Thanks to Sergej Reich for his help with the patch.

9 years agoFixing a memory leak when using Bullet's btGImpactMeshShape for triangle meshes ...
Mitchell Stokes [Sun, 8 Jul 2012 23:15:26 +0000 (23:15 +0000)]
Fixing a memory leak when using Bullet's btGImpactMeshShape for triangle meshes (e.g., rigid bodies). The physic controller's free was only handling the case where regular triangle meshes were used.

9 years agocode cleanup
Campbell Barton [Sun, 8 Jul 2012 21:37:59 +0000 (21:37 +0000)]
code cleanup

9 years agolocalview operator now reports when 8 views are reached (since 2.5x update was printi...
Campbell Barton [Sun, 8 Jul 2012 20:53:44 +0000 (20:53 +0000)]
localview operator now reports when 8 views are reached (since 2.5x update was printing in console only).

9 years agostyle cleanup
Campbell Barton [Sun, 8 Jul 2012 20:36:00 +0000 (20:36 +0000)]
style cleanup

9 years agoFixing a memory leak introduced by the Character Physics type patch: a new btGhostPai...
Mitchell Stokes [Sun, 8 Jul 2012 20:05:40 +0000 (20:05 +0000)]
Fixing a memory leak introduced by the Character Physics type patch: a new btGhostPairCallback was being created, but never freed.

9 years agosvn merge ^/trunk/blender -r48729:48739
Campbell Barton [Sun, 8 Jul 2012 18:21:51 +0000 (18:21 +0000)]
svn merge ^/trunk/blender -r48729:48739

9 years agoplay animation now works switching between scrubbing and pingpong
Campbell Barton [Sun, 8 Jul 2012 18:20:29 +0000 (18:20 +0000)]
play animation now works switching between scrubbing and pingpong

9 years agocorrect another case of nonnull (all should be correct now), and comment about color...
Campbell Barton [Sun, 8 Jul 2012 17:51:28 +0000 (17:51 +0000)]
correct another case of nonnull (all should be correct now), and comment about color conversion.

9 years agoGrmbl, dummy argparse...
Bastien Montagne [Sun, 8 Jul 2012 17:18:01 +0000 (17:18 +0000)]
Grmbl, dummy argparse...

9 years agoSome cleanup, and update to make those files usable both as self-executables and...
Bastien Montagne [Sun, 8 Jul 2012 17:10:10 +0000 (17:10 +0000)]
Some cleanup, and update to make those files usable both as self-executables and module stuff...

Also updated update_mo to allwo specifying a custom po/mo file.

9 years agocorrect use of nonull attribute
Campbell Barton [Sun, 8 Jul 2012 17:08:27 +0000 (17:08 +0000)]
correct use of nonull attribute

9 years agosvn merge ^/trunk/blender -r48691:48729
Campbell Barton [Sun, 8 Jul 2012 15:55:58 +0000 (15:55 +0000)]
svn merge ^/trunk/blender -r48691:48729

9 years agoFix for error from grumpy gcc in "over-warning" mode. Must explicitely cast uintptr_t...
Bastien Montagne [Sun, 8 Jul 2012 15:48:47 +0000 (15:48 +0000)]
Fix for error from grumpy gcc in "over-warning" mode. Must explicitely cast uintptr_t to unsigned int (othe solution would be to use PRIuPTR macro from inttypes.h, but that would probably causes some problems with windows...).

9 years agocorrect use of __attribute__((nonnull))
Campbell Barton [Sun, 8 Jul 2012 15:11:13 +0000 (15:11 +0000)]
correct use of __attribute__((nonnull))

9 years agoMulti device OpenCL did not work.
Jeroen Bakker [Sun, 8 Jul 2012 13:03:09 +0000 (13:03 +0000)]
Multi device OpenCL did not work.
case was that cached kernels were used by both devices in separate

removed the cached kernels.

9 years agocode cleanup: quiet uninitialized memory use warning for X11 - harmless in this case...
Campbell Barton [Sun, 8 Jul 2012 12:23:58 +0000 (12:23 +0000)]
code cleanup: quiet uninitialized memory use warning for X11 - harmless in this case but always gave warnings with memcheck (RGB color for alpha zero icon color wasnt initialized).

also some other minor changes.

9 years agoSome cleanup.
Bastien Montagne [Sun, 8 Jul 2012 09:27:33 +0000 (09:27 +0000)]
Some cleanup.

Also trying to make it usuable from other tools (imports become a bit tricky here :/ ).

9 years agouse gcc attrubutes to warn on unused return values and arguments which shouldnt be...
Campbell Barton [Sun, 8 Jul 2012 06:00:27 +0000 (06:00 +0000)]
use gcc attrubutes to warn on unused return values and arguments which shouldnt be NULL.

also remove IDP_AppendArray's return value which wasnt the new item in the array (which is odd/misleading), but wasnt used anywhere either.

9 years agoFix for [#31701] "radar causes collision" reported by Markus Rietz (afeature).
Mitchell Stokes [Sun, 8 Jul 2012 05:00:16 +0000 (05:00 +0000)]
Fix for [#31701] "radar causes collision" reported by Markus Rietz (afeature).

The problem was that the physics shapes for the near and radar sensor were getting turned into characters because CcdConstructionInfo::m_bCharacter was defaulting to true. Now it defaults to false and is explicitly set to true for only Character physics types.

9 years agouse alloc_size attribute for guarded alloc functions with gcc.
Campbell Barton [Sun, 8 Jul 2012 03:15:37 +0000 (03:15 +0000)]
use alloc_size attribute for guarded alloc functions with gcc.

9 years agofix [#32020] Image will not render in second (any scene other than first) if scene...
Campbell Barton [Sun, 8 Jul 2012 00:04:41 +0000 (00:04 +0000)]
fix [#32020] Image will not render in second (any scene other than first) if scene name is longer than 28 characters

9 years agoFixing a typo!
Bastien Montagne [Sat, 7 Jul 2012 23:38:40 +0000 (23:38 +0000)]
Fixing a typo!

9 years agostyle cleanup
Campbell Barton [Sat, 7 Jul 2012 22:51:57 +0000 (22:51 +0000)]
style cleanup

9 years agoincrease file browser title length for multibyte translations and use utf8 copy...
Sv. Lockal [Sat, 7 Jul 2012 14:58:40 +0000 (14:58 +0000)]
increase file browser title length  for multibyte translations and use utf8 copy for it

9 years agoUpdate/fixes (was escaping more chars than needed!)
Bastien Montagne [Sat, 7 Jul 2012 14:28:49 +0000 (14:28 +0000)]
Update/fixes (was escaping more chars than needed!)

9 years agoMinor UI message update.
Bastien Montagne [Sat, 7 Jul 2012 13:51:07 +0000 (13:51 +0000)]
Minor UI message update.

9 years agoAdding a note to KX_Camera.projection_matrix and KX_Camera.modelview_matrix to warn...
Mitchell Stokes [Sat, 7 Jul 2012 06:42:44 +0000 (06:42 +0000)]
Adding a note to KX_Camera.projection_matrix and KX_Camera.modelview_matrix to warn that both values are the identity matrix prior to the first frame of rendering. Both values are calculated when rendering, which is after Python scripts have a chance to run on frame 1.

9 years agostyle cleanup: use c style comments in C code
Campbell Barton [Fri, 6 Jul 2012 23:56:59 +0000 (23:56 +0000)]
style cleanup: use c style comments in C code

9 years agocode cleanup: dont use function calls like dot_v3v3, pow and sqrt within macros which...
Campbell Barton [Fri, 6 Jul 2012 22:48:28 +0000 (22:48 +0000)]
code cleanup: dont use function calls like dot_v3v3, pow and sqrt within macros which results in calling the function multiple times needlessly.

also added some comments.

9 years agosvn merge ^/trunk/blender -r48681:48691
Campbell Barton [Fri, 6 Jul 2012 20:28:35 +0000 (20:28 +0000)]
svn merge ^/trunk/blender -r48681:48691

9 years agodecrease size for convex hull epsilon when checking which side of a face the vertex...
Campbell Barton [Fri, 6 Jul 2012 20:16:04 +0000 (20:16 +0000)]
decrease size for convex hull epsilon when checking which side of a face the vertex is on.

this doesnt fix all cases but works better then it did.

9 years agostyle cleanup: var names
Campbell Barton [Fri, 6 Jul 2012 19:22:21 +0000 (19:22 +0000)]
style cleanup: var names

9 years agoFix for bug 32017.
Chris Want [Fri, 6 Jul 2012 16:55:35 +0000 (16:55 +0000)]
Fix for bug 32017.

There was some bad recursion introduced recently that caused crashes
when a Material node is the same material as the material itself (e.g.,
if Material.001 has a node with Material.001).

This commit attempt to correct this by keeping track of the material
at the root of the node tree, and doesn't recurse further if it
encounters it again within the nodetree.

Joshua, please review!

9 years agofix for crash when render result is NULL
Campbell Barton [Fri, 6 Jul 2012 14:26:22 +0000 (14:26 +0000)]
fix for crash when render result is NULL

9 years agosvn merge ^/trunk/blender -r48674:48681
Campbell Barton [Fri, 6 Jul 2012 14:25:49 +0000 (14:25 +0000)]
svn merge ^/trunk/blender -r48674:48681

9 years agofix for rare crash we have with some mango files.
Campbell Barton [Fri, 6 Jul 2012 14:24:41 +0000 (14:24 +0000)]
fix for rare crash we have with some mango files.

9 years agoFix ultra stupid mistake on Scons.
Antony Riakiotakis [Fri, 6 Jul 2012 13:36:54 +0000 (13:36 +0000)]
Fix ultra stupid mistake on Scons.

9 years agoTomato keying screen: small fixes and improvements
Sergey Sharybin [Fri, 6 Jul 2012 12:59:00 +0000 (12:59 +0000)]
Tomato keying screen: small fixes and improvements

- 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.

9 years ago * Added OpenCL implementation of the Defocus node
Jeroen Bakker [Fri, 6 Jul 2012 11:31:40 +0000 (11:31 +0000)]
 * Added OpenCL implementation of the Defocus node
 * Always disable two phase compositing during rendering

 - At Mind -

9 years agouse icons for rgb colors
Campbell Barton [Fri, 6 Jul 2012 11:24:43 +0000 (11:24 +0000)]
use icons for rgb colors

9 years agoFix [#31923] Particle instanced objects don't show textures in render
Bastien Montagne [Fri, 6 Jul 2012 10:03:27 +0000 (10:03 +0000)]
Fix [#31923] Particle instanced objects don't show textures in render

Actually, particle instance modifier was still using tessfaces, but copying poly cdata!

Simply made it using poly/loop.

9 years agosvn merge ^/trunk/blender -r48658:48674
Campbell Barton [Fri, 6 Jul 2012 09:24:47 +0000 (09:24 +0000)]
svn merge ^/trunk/blender -r48658:48674

9 years agorgb color display options for compo backdrop.
Campbell Barton [Fri, 6 Jul 2012 09:22:59 +0000 (09:22 +0000)]
rgb color display options for compo backdrop.

9 years agoFix [#32003] Triangulate fails for simple case.
Bastien Montagne [Fri, 6 Jul 2012 07:40:54 +0000 (07:40 +0000)]
Fix [#32003] Triangulate fails for simple case.

Main problem was in poly_rotate_plane() (which rotates a ngon to make its normal aligned with Z axis), it did not handled the case where the normal was aligned but opposite to the Z axis (which had the consequence that, as with the T mesh of the given blend, all tested new edges inside face were detected as outside, and vice-versa...).

Additionnaly, I made a mistake in previous Triangulate commit (r48243) in bm_face_goodline, which could allow a few invalid triangles in some specific cases, fixed!

And done a bit of cleanup, as I was at it.

9 years agoFix for [#31978] "Horizon colour drawn on two edges of screen when a 2D filter is...
Mitchell Stokes [Thu, 5 Jul 2012 21:03:29 +0000 (21:03 +0000)]
Fix for [#31978] "Horizon colour drawn on two edges of screen when a 2D filter is active" reported by Alex Fraser.

The glViewport used for 2D Filters wasn't quite matching the 3d view. It seems the height and width were both off by one. There may be a deeper bug with the canvas rectangle having slightly wrong dimensions, but this at least fixes the 2D Filters.

9 years agoYou do not need to create an object to call a static function.
Jason Wilkins [Thu, 5 Jul 2012 20:44:42 +0000 (20:44 +0000)]
You do not need to create an object to call a static function.

9 years agoFix for [#31122] "Properties cant have Spaces in names when using interval as a evalu...
Mitchell Stokes [Thu, 5 Jul 2012 20:34:42 +0000 (20:34 +0000)]
Fix for [#31122] "Properties cant have Spaces in names when using interval as a evaluation. Or else it'll fail to activate actuator." reported by Auuman Anubis.

I cleaned up the INTERVAL check to do a much cleaner (and saner) range check that doesn't get messed up by spaces.

9 years agosvn merge ^/trunk/blender -r48638:48658
Campbell Barton [Thu, 5 Jul 2012 18:04:17 +0000 (18:04 +0000)]
svn merge ^/trunk/blender -r48638:48658