Commit Graph

33916 Commits

Author SHA1 Message Date
Sergey Sharybin
1f79fa111f Merging r50147 through r50148 from trunk into soc-2011-tomato 2012-08-23 09:05:45 +00:00
Sergey Sharybin
9bae78ed5d Sequencer: move up/down operators for modifiers 2012-08-23 09:04:30 +00:00
Campbell Barton
6b09ca6cc1 svn merge ^/trunk/blender -r50143:50146 2012-08-23 08:54:06 +00:00
Campbell Barton
40db82e314 alt page up/down now jump between strip center frames (since often the middle frame is a better sample to check). 2012-08-23 08:10:45 +00:00
Campbell Barton
25b7370e86 de-duplicate sequencer jump operator, use next/prev option instead. 2012-08-23 07:39:51 +00:00
Campbell Barton
a4188f6303 svn merge ^/trunk/blender -r50138:50143 2012-08-23 07:14:53 +00:00
Campbell Barton
9ecc6fdcc7 style cleanup 2012-08-23 07:10:48 +00:00
Campbell Barton
4e772065d7 set defaults for de-speckle 2012-08-23 07:02:11 +00:00
Campbell Barton
1ab5a4f0ed despeckle composite node 2012-08-23 06:48:01 +00:00
Campbell Barton
2ddb37b98b nothread was committed to tomato by accident 2012-08-23 06:40:19 +00:00
Campbell Barton
749d98ed71 svn merge ^/trunk/blender -r50132:50138 2012-08-23 06:32:51 +00:00
Campbell Barton
45a0287f45 change I made gave a little nicer bleeding direction for inpaint but introduced dithering artifact. 2012-08-23 06:27:12 +00:00
Campbell Barton
6e90903baf - add BM_data_interp_from_edges() function (matches BM_data_interp_from_verts).
- bridge-merged now merges edge customdata and flags for verts and edges.
2012-08-23 05:19:40 +00:00
Campbell Barton
c0c575751d bmesh tool: support for merged-bridge (like bridge, collapsing), with a
factor to blend between loops.
2012-08-23 04:55:59 +00:00
Antony Riakiotakis
7683f87f27 Fix compilation on MinGW after recent utf 16 fixes (possibly win32 too). gcc ostream does not support wchar_t, I hope it works as expected with unicode filenames. 2012-08-22 19:01:09 +00:00
Sergey Sharybin
6900c792d1 Merging r50119 through r50132 from trunk into soc-2011-tomato 2012-08-22 17:23:02 +00:00
Sergey Sharybin
b0dd030ba6 Fixed regression introduced in 50107
Shader preview job localizes material without referencing it as a user,
so don't need to unreference itself as a user from this material.

Added BKE_material_free_ex function which could skip user dereferencing.
This also removed old hack with mtex users.
2012-08-22 17:22:04 +00:00
Sergey Sharybin
df3c9eb1f7 Color management: code cleanup 2012-08-22 16:48:22 +00:00
Sergey Sharybin
93ca64c12a Sequencer: fix crash caused by incorrect handling of color management on ImBuf duplicate 2012-08-22 16:45:09 +00:00
Campbell Barton
1939baa47d style cleanup 2012-08-22 16:44:32 +00:00
Sergey Sharybin
2dcaa8f863 Sequencer: fix sequence color space applying twice when rendering meta strips 2012-08-22 16:16:38 +00:00
Sergey Sharybin
78ea8df341 Movie cache: made it thread safe to operate with memory limitor
Movie cache is using global memory limitor, which isn't thread safe
in some of operations, so it required to add mutex around limitor
operations in movie cache.

It's probably could be solved in a way with less locks involved
bu using different limitor for different areas (like use own limitor
for clips, own limitor for sequencer and so), but that wouldn't be
so easy to control overall memory usage.
2012-08-22 15:13:14 +00:00
Brecht Van Lommel
84e80b6904 Fix #32301: mesh select more/less not taking hidden vertices/faces into account. 2012-08-22 15:10:07 +00:00
Campbell Barton
b2483c3dbe despeckle node for tomato only 2012-08-22 15:08:41 +00:00
Brecht Van Lommel
7f9467098e Fix #32309: missing shortcuts in sculpt mode Hide/Mask menu. Keymap poll was too
strict, only has to check if we are in sculpt mode, not if the mouse is in the
main region too.
2012-08-22 14:27:09 +00:00
Brecht Van Lommel
d3f1222d38 Fix #32262: mesh bridge between edge loops failed to find a good edge matching
in some cases, in particular when the the edge loops were not planar.

Now rather than finding the shortest distance between two vertices, one from
each edge loop and using that as a starting point, it now finds the smallest
sum of distances between all vertex pairs that would be connected.
2012-08-22 14:27:06 +00:00
Sergey Sharybin
dd65a6b67d Color Management: pipeline cleanup
- Move color management settings to scene, so it's now clear for
  all areas (such as compositor, sequencer) which settings to
  use for display buffers

- Currently removed per-editor color management settings. It could
  be nice to have them, but they don't fit nicely into overall
  pipeline and could be added as a override settings for display
  only later.

- Make sequencer working in space defined by sequencer_workspace
  role in OCIO configuration file.
  If this role is not set, sequencer will fallback to legacy sRGB
  Gamma 2.2 space.

  Currently use vd16 color space for sequencer. Not sure what exactly
  this color space is, but it's pretty close to SPI Film view and
  it's still invertable.

- Sequencer will now output linear float buffers, not color managed
  float buffers.
  Before this sequencer used to output float buffers in sRGB space,
  which was sequencer's working space. Now it can not output buffers
  in this space since other areas are not aware of this space.
  This also makes it's consistent that all float buffers in Blender
  are in linear space.

- When saving render result into byte file format scene's display
  transform would be applied on this buffer.
  When saving files from image editor, there'll be a display
  transform settings which are default set to scene's settings but
  could also be overwritten.

Additional details are there (would be extended soon):

  http://wiki.blender.org/index.php/User:Nazg-gul/ColorManagement
2012-08-22 14:23:08 +00:00
Sergey Sharybin
24498f084d Merging r50113 through r50118 from trunk into soc-2011-tomato 2012-08-22 13:46:23 +00:00
Sergey Sharybin
0fbd15df0f Sequencer: fix for incorrect proxies rendering after some recent refactor 2012-08-22 13:45:20 +00:00
Campbell Barton
267f625179 lasso select works in the node editor again, Ctrl+Alt+LMB, Ctrl+Alt+Shif+LMB to deselect 2012-08-22 13:34:06 +00:00
Brecht Van Lommel
97ee630dcd Fix #32201: particle size compatibility broken for object/group duplication.
After 2.63 there was a bugfix to take object scale into account for the duplicated
objects, but this breaks compatibility on earlier files. Now there is an option to
control if the scale should be used or not.

Scale is used by default on newer files, and not used on older ones.
2012-08-22 13:10:43 +00:00
Brecht Van Lommel
61dddcb800 Fix part of #32377: TIFF not saving on windows to paths with special characters,
and DDS should not be in the list of file types because we can only load those
currently.
2012-08-22 13:10:37 +00:00
Campbell Barton
10b983002f fix for glitch with mask refresh in the image view when lock was disabled - it would never update the image, (now check G.moving) 2012-08-22 13:03:54 +00:00
Campbell Barton
c984a8fa56 svn merge ^/trunk/blender -r50107:50112 2012-08-22 12:04:27 +00:00
Campbell Barton
f67d0e63a4 add new mask blend mode: 'Merge Subtract'. gives better results when using feather on overlapping masks when one subtracts from another. 2012-08-22 11:58:59 +00:00
Campbell Barton
7d673ef0d2 fix for blend_render_info.py not closing file & some edits to comments. 2012-08-22 10:29:30 +00:00
Campbell Barton
6e127b3009 svn merge ^/trunk/blender -r50091:50107 2012-08-22 09:36:49 +00:00
Campbell Barton
2b9fd376e1 all areas of blender now do node tree id user count management, except for some exceptions like making a node tree local and material clipboard. 2012-08-22 09:35:46 +00:00
Campbell Barton
a4fd9f827b fix for bug where scene copy and free didn't manage ID users.
you could for eg, make a full copy of a scene, then manually remove its compo nodes - which would give invalid zero user count.
2012-08-22 09:10:16 +00:00
Campbell Barton
ffcc63a7d0 node tree functions for copy/free now support optional ID user count management,
this is not used yet, so no functional changes.
2012-08-22 08:54:18 +00:00
Campbell Barton
c92ab5c3ef code cleanup: use rect size macros 2012-08-21 20:34:05 +00:00
Campbell Barton
abd031bb4e code cleanup: use rect size macros for the interface 2012-08-21 19:35:06 +00:00
Campbell Barton
dd21def25d fixed [#32373] Copy Vertex Group operator copies any value as full 1.0 2012-08-21 15:57:59 +00:00
Campbell Barton
94aaf43df9 svn merge ^/trunk/blender -r50089:50091 2012-08-21 15:45:58 +00:00
Campbell Barton
0fd2448c8b alt+wheel scrolling over the render slots works again (this didnt support scrolling when new interfaces would replace the old ones). 2012-08-21 15:45:17 +00:00
Campbell Barton
498e45d77b svn merge ^/trunk/blender -r50080:50089 2012-08-21 15:16:53 +00:00
Campbell Barton
3090ae35af fix [#32374] Curve compositor UI drawing glitch
copy the curve for the compositor.
2012-08-21 15:14:29 +00:00
Brecht Van Lommel
857a3cd112 Fix #32334: mesh separate by material with > 2 materials could include some
incorrect extra edges.
2012-08-21 14:49:07 +00:00
Campbell Barton
8bd7c3fba2 change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation. 2012-08-21 14:43:51 +00:00
Brecht Van Lommel
809fce9d00 Fix #32341: extrude with a mirror modifier could lead to orphan vertices, it
was already removing unnecessary edges, just not vertices of those edges.
2012-08-21 14:38:03 +00:00