9 years agoMerging r50160 through r50161 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 23 Aug 2012 16:15:37 +0000 (16:15 +0000)]
Merging r50160 through r50161 from trunk into soc-2011-tomato

9 years agoSequencer: display color sample information when mouse is holded down
Sergey Sharybin [Thu, 23 Aug 2012 16:14:52 +0000 (16:14 +0000)]
Sequencer: display color sample information when mouse is holded down

Behaves in exactly the same way as image editor's color sampling.

Would be nice to display color managed color too, but that's for tomato branch.

9 years agosvn merge ^/trunk/blender -r50156:50159
Campbell Barton [Thu, 23 Aug 2012 15:16:57 +0000 (15:16 +0000)]
svn merge ^/trunk/blender -r50156:50159

9 years agosequencer zooms horizontal only from mouse wheel and plus buttons.
Campbell Barton [Thu, 23 Aug 2012 14:49:20 +0000 (14:49 +0000)]
sequencer zooms horizontal only from mouse wheel and plus buttons.

9 years agoFix #32387: some mesh modifications breaking other shape keys.
Brecht Van Lommel [Thu, 23 Aug 2012 13:54:30 +0000 (13:54 +0000)]
Fix #32387: some mesh modifications breaking other shape keys.

The vertex shapekey index is now no longer copied, and propagation of offsets
in the basis to other shapekeys is disabled if new vertices were added. The
reason being that the propagation will only be done for the old vertices leaving
the new ones behind, and so doing e.g. subdivide + translate on the basis would
create a mess on other shape keys.

9 years agoMerging r50149 through r50156 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 23 Aug 2012 13:51:41 +0000 (13:51 +0000)]
Merging r50149 through r50156 from trunk into soc-2011-tomato

9 years agoSequencer: fix for color balance keyframing and modifier renaming
Sergey Sharybin [Thu, 23 Aug 2012 13:32:54 +0000 (13:32 +0000)]
Sequencer: fix for color balance keyframing and modifier renaming

9 years agoFix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows.
Brecht Van Lommel [Thu, 23 Aug 2012 11:18:31 +0000 (11:18 +0000)]
Fix #32388: bpy.ops.wm.path_open() not working with path with spaces on Windows.

9 years agoFix #32391: new remove doubles "unselected" option was enabled by default, don't
Brecht Van Lommel [Thu, 23 Aug 2012 10:56:16 +0000 (10:56 +0000)]
Fix #32391: new remove doubles "unselected" option was enabled by default, don't
think this was intentional.

9 years agoFix #32389: scons was compiling without iksolver and only itasc since a few days,
Brecht Van Lommel [Thu, 23 Aug 2012 10:56:14 +0000 (10:56 +0000)]
Fix #32389: scons was compiling without iksolver and only itasc since a few days,
which gave performance issues.

9 years agocode cleanup: use const weights for customdata interpolation functions
Campbell Barton [Thu, 23 Aug 2012 09:54:15 +0000 (09:54 +0000)]
code cleanup: use const weights for customdata interpolation functions

9 years agoBGE: When creating a controller by linking a sensor and actuator, the created control...
Mitchell Stokes [Thu, 23 Aug 2012 09:24:59 +0000 (09:24 +0000)]
BGE: When creating a controller by linking a sensor and actuator, the created controller will always be an and controller instead of the last controller type added.

9 years agofix own error in BM_data_interp_from_edges() from recent commit.
Campbell Barton [Thu, 23 Aug 2012 09:20:15 +0000 (09:20 +0000)]
fix own error in BM_data_interp_from_edges() from recent commit.

9 years agoMerging r50147 through r50148 from trunk into soc-2011-tomato
Sergey Sharybin [Thu, 23 Aug 2012 09:05:45 +0000 (09:05 +0000)]
Merging r50147 through r50148 from trunk into soc-2011-tomato

9 years agoSequencer: move up/down operators for modifiers
Sergey Sharybin [Thu, 23 Aug 2012 09:04:30 +0000 (09:04 +0000)]
Sequencer: move up/down operators for modifiers

9 years agosvn merge ^/trunk/blender -r50143:50146
Campbell Barton [Thu, 23 Aug 2012 08:54:06 +0000 (08:54 +0000)]
svn merge ^/trunk/blender -r50143:50146

9 years agoalt page up/down now jump between strip center frames (since often the middle frame...
Campbell Barton [Thu, 23 Aug 2012 08:10:45 +0000 (08:10 +0000)]
alt page up/down now jump between strip center frames (since often the middle frame is a better sample to check).

9 years agode-duplicate sequencer jump operator, use next/prev option instead.
Campbell Barton [Thu, 23 Aug 2012 07:39:51 +0000 (07:39 +0000)]
de-duplicate sequencer jump operator, use next/prev option instead.

9 years agosvn merge ^/trunk/blender -r50138:50143
Campbell Barton [Thu, 23 Aug 2012 07:14:53 +0000 (07:14 +0000)]
svn merge ^/trunk/blender -r50138:50143

9 years agostyle cleanup
Campbell Barton [Thu, 23 Aug 2012 07:10:48 +0000 (07:10 +0000)]
style cleanup

9 years agoset defaults for de-speckle
Campbell Barton [Thu, 23 Aug 2012 07:02:11 +0000 (07:02 +0000)]
set defaults for de-speckle

9 years agodespeckle composite node
Campbell Barton [Thu, 23 Aug 2012 06:48:01 +0000 (06:48 +0000)]
despeckle composite node

9 years agonothread was committed to tomato by accident
Campbell Barton [Thu, 23 Aug 2012 06:40:19 +0000 (06:40 +0000)]
nothread was committed to tomato by accident

9 years agosvn merge ^/trunk/blender -r50132:50138
Campbell Barton [Thu, 23 Aug 2012 06:32:51 +0000 (06:32 +0000)]
svn merge ^/trunk/blender -r50132:50138

9 years agochange I made gave a little nicer bleeding direction for inpaint but introduced dithe...
Campbell Barton [Thu, 23 Aug 2012 06:27:12 +0000 (06:27 +0000)]
change I made gave a little nicer bleeding direction for inpaint but introduced dithering artifact.

9 years ago- add BM_data_interp_from_edges() function (matches BM_data_interp_from_verts).
Campbell Barton [Thu, 23 Aug 2012 05:19:40 +0000 (05:19 +0000)]
- 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.

9 years agobmesh tool: support for merged-bridge (like bridge, collapsing), with a
Campbell Barton [Thu, 23 Aug 2012 04:55:59 +0000 (04:55 +0000)]
bmesh tool: support for merged-bridge (like bridge, collapsing), with a
factor to blend between loops.

9 years agoFix compilation on MinGW after recent utf 16 fixes (possibly win32 too). gcc ostream...
Antony Riakiotakis [Wed, 22 Aug 2012 19:01:09 +0000 (19:01 +0000)]
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.

9 years agoMerging r50119 through r50132 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 22 Aug 2012 17:23:02 +0000 (17:23 +0000)]
Merging r50119 through r50132 from trunk into soc-2011-tomato

9 years agoFixed regression introduced in 50107
Sergey Sharybin [Wed, 22 Aug 2012 17:22:04 +0000 (17:22 +0000)]
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.

9 years agoColor management: code cleanup
Sergey Sharybin [Wed, 22 Aug 2012 16:48:22 +0000 (16:48 +0000)]
Color management: code cleanup

9 years agoSequencer: fix crash caused by incorrect handling of color management on ImBuf duplicate
Sergey Sharybin [Wed, 22 Aug 2012 16:45:09 +0000 (16:45 +0000)]
Sequencer: fix crash caused by incorrect handling of color management on ImBuf duplicate

9 years agostyle cleanup
Campbell Barton [Wed, 22 Aug 2012 16:44:32 +0000 (16:44 +0000)]
style cleanup

9 years agoSequencer: fix sequence color space applying twice when rendering meta strips
Sergey Sharybin [Wed, 22 Aug 2012 16:16:38 +0000 (16:16 +0000)]
Sequencer: fix sequence color space applying twice when rendering meta strips

9 years agohook menu was using last remembered use_bone setting
Campbell Barton [Wed, 22 Aug 2012 15:38:03 +0000 (15:38 +0000)]
hook menu was using last remembered use_bone setting

9 years agoMovie cache: made it thread safe to operate with memory limitor
Sergey Sharybin [Wed, 22 Aug 2012 15:13:14 +0000 (15:13 +0000)]
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.

9 years agoFix #32301: mesh select more/less not taking hidden vertices/faces into account.
Brecht Van Lommel [Wed, 22 Aug 2012 15:10:07 +0000 (15:10 +0000)]
Fix #32301: mesh select more/less not taking hidden vertices/faces into account.

9 years agodespeckle node for tomato only
Campbell Barton [Wed, 22 Aug 2012 15:08:41 +0000 (15:08 +0000)]
despeckle node for tomato only

9 years agodoc type correction
Campbell Barton [Wed, 22 Aug 2012 15:04:11 +0000 (15:04 +0000)]
doc type correction

9 years agoFix #32309: missing shortcuts in sculpt mode Hide/Mask menu. Keymap poll was too
Brecht Van Lommel [Wed, 22 Aug 2012 14:27:09 +0000 (14:27 +0000)]
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.

9 years agoFix #32262: mesh bridge between edge loops failed to find a good edge matching
Brecht Van Lommel [Wed, 22 Aug 2012 14:27:06 +0000 (14:27 +0000)]
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.

9 years agoColor Management: pipeline cleanup
Sergey Sharybin [Wed, 22 Aug 2012 14:23:08 +0000 (14:23 +0000)]
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):

9 years agoMerging r50113 through r50118 from trunk into soc-2011-tomato
Sergey Sharybin [Wed, 22 Aug 2012 13:46:23 +0000 (13:46 +0000)]
Merging r50113 through r50118 from trunk into soc-2011-tomato

9 years agoSequencer: fix for incorrect proxies rendering after some recent refactor
Sergey Sharybin [Wed, 22 Aug 2012 13:45:20 +0000 (13:45 +0000)]
Sequencer: fix for incorrect proxies rendering after some recent refactor

9 years agolasso select works in the node editor again, Ctrl+Alt+LMB, Ctrl+Alt+Shif+LMB to deselect
Campbell Barton [Wed, 22 Aug 2012 13:34:06 +0000 (13:34 +0000)]
lasso select works in the node editor again, Ctrl+Alt+LMB, Ctrl+Alt+Shif+LMB to deselect

9 years agoFix #32201: particle size compatibility broken for object/group duplication.
Brecht Van Lommel [Wed, 22 Aug 2012 13:10:43 +0000 (13:10 +0000)]
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.

9 years agoFix part of #32377: TIFF not saving on windows to paths with special characters,
Brecht Van Lommel [Wed, 22 Aug 2012 13:10:37 +0000 (13:10 +0000)]
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

9 years agofix for glitch with mask refresh in the image view when lock was disabled - it would...
Campbell Barton [Wed, 22 Aug 2012 13:03:54 +0000 (13:03 +0000)]
fix for glitch with mask refresh in the image view when lock was disabled - it would never update the image, (now check G.moving)

9 years agosvn merge ^/trunk/blender -r50107:50112
Campbell Barton [Wed, 22 Aug 2012 12:04:27 +0000 (12:04 +0000)]
svn merge ^/trunk/blender -r50107:50112

9 years agoadd new mask blend mode: 'Merge Subtract'. gives better results when using feather...
Campbell Barton [Wed, 22 Aug 2012 11:58:59 +0000 (11:58 +0000)]
add new mask blend mode: 'Merge Subtract'. gives better results when using feather on overlapping masks when one subtracts from another.

9 years agofix for rare crash in cycles BVH tree packing.
Campbell Barton [Wed, 22 Aug 2012 11:18:37 +0000 (11:18 +0000)]
fix for rare crash in cycles BVH tree packing.

9 years agofix for not closing file & some edits to comments.
Campbell Barton [Wed, 22 Aug 2012 10:29:30 +0000 (10:29 +0000)]
fix for not closing file & some edits to comments.

9 years agoerror message when an addon was missing register/unregister functions whasnt very...
Campbell Barton [Wed, 22 Aug 2012 10:03:37 +0000 (10:03 +0000)]
error message when an addon was missing register/unregister functions whasnt very good (didnt point to file with the error)

9 years agosvn merge ^/trunk/blender -r50091:50107
Campbell Barton [Wed, 22 Aug 2012 09:36:49 +0000 (09:36 +0000)]
svn merge ^/trunk/blender -r50091:50107

9 years agoall areas of blender now do node tree id user count management, except for some excep...
Campbell Barton [Wed, 22 Aug 2012 09:35:46 +0000 (09:35 +0000)]
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.

9 years agofix for bug where scene copy and free didn't manage ID users.
Campbell Barton [Wed, 22 Aug 2012 09:10:16 +0000 (09:10 +0000)]
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.

9 years agonode tree functions for copy/free now support optional ID user count management,
Campbell Barton [Wed, 22 Aug 2012 08:54:18 +0000 (08:54 +0000)]
node tree functions for copy/free now support optional ID user count management,
this is not used yet, so no functional changes.

9 years agoTurn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds...
Antony Riakiotakis [Wed, 22 Aug 2012 00:06:09 +0000 (00:06 +0000)]
Turn OpenMP off for MinGW64. I thought it behaved correctly in new compiler builds but unfortunately it looks like there is some issue still which mostly shows when openmp threads stop. This causes crashes after rendering with subsurf, multires, when calculating fluids and possibly when other functionality is used as well.

This should make MinGW64 builds quite stable again :)

9 years agoFor gcc based systems use g++ for linking. This is necessary so that exceptions are...
Antony Riakiotakis [Tue, 21 Aug 2012 21:01:07 +0000 (21:01 +0000)]
For gcc based systems use g++ for linking. This is necessary so that exceptions are propagated between shared libraries. We already use g++ when linking with cmake.

This solves crash when trying to render with missing files on MinGW-w64 cycles. The cause was an OpenEXR exception that went uncaught when trying to check the file's extension through OpenImageIO while building the shader tree. Thus my bug-hunting frustration can end with a happy chord.

9 years agocode cleanup: use rect size macros
Campbell Barton [Tue, 21 Aug 2012 20:34:05 +0000 (20:34 +0000)]
code cleanup: use rect size macros

9 years agocode cleanup: use rect size macros for the interface
Campbell Barton [Tue, 21 Aug 2012 19:35:06 +0000 (19:35 +0000)]
code cleanup: use rect size macros for the interface

9 years agofixed [#32373] Copy Vertex Group operator copies any value as full 1.0
Campbell Barton [Tue, 21 Aug 2012 15:57:59 +0000 (15:57 +0000)]
fixed [#32373] Copy Vertex Group operator copies any value as full 1.0

9 years agosvn merge ^/trunk/blender -r50089:50091
Campbell Barton [Tue, 21 Aug 2012 15:45:58 +0000 (15:45 +0000)]
svn merge ^/trunk/blender -r50089:50091

9 years agoalt+wheel scrolling over the render slots works again (this didnt support scrolling...
Campbell Barton [Tue, 21 Aug 2012 15:45:17 +0000 (15:45 +0000)]
alt+wheel scrolling over the render slots works again (this didnt support scrolling when new interfaces would replace the old ones).

9 years agosvn merge ^/trunk/blender -r50080:50089
Campbell Barton [Tue, 21 Aug 2012 15:16:53 +0000 (15:16 +0000)]
svn merge ^/trunk/blender -r50080:50089

9 years agofix [#32374] Curve compositor UI drawing glitch
Campbell Barton [Tue, 21 Aug 2012 15:14:29 +0000 (15:14 +0000)]
fix [#32374] Curve compositor UI drawing glitch
copy the curve for the compositor.

9 years agoFix #32334: mesh separate by material with > 2 materials could include some
Brecht Van Lommel [Tue, 21 Aug 2012 14:49:07 +0000 (14:49 +0000)]
Fix #32334: mesh separate by material with > 2 materials could include some
incorrect extra edges.

9 years agochange curve evaluation functions never to modify curve data (ensures thread safety...
Campbell Barton [Tue, 21 Aug 2012 14:43:51 +0000 (14:43 +0000)]
change curve evaluation functions never to modify curve data (ensures thread safety), now initializations has to be done outside evaluation.

9 years agoFix #32341: extrude with a mirror modifier could lead to orphan vertices, it
Brecht Van Lommel [Tue, 21 Aug 2012 14:38:03 +0000 (14:38 +0000)]
Fix #32341: extrude with a mirror modifier could lead to orphan vertices, it
was already removing unnecessary edges, just not vertices of those edges.

9 years agoFix #32369: pixel glitch with compositor curves node, and some pixels having
Brecht Van Lommel [Tue, 21 Aug 2012 13:19:34 +0000 (13:19 +0000)]
Fix #32369: pixel glitch with compositor curves node, and some pixels having
black point = white point. That's a degenerate case, clamped it now to 1e5,
which is a bit arbitrary, but infinity would give NaN issues.

9 years agoFix #32355: select vertex path not working when vertices are selected with e.g.
Brecht Van Lommel [Tue, 21 Aug 2012 13:19:31 +0000 (13:19 +0000)]
Fix #32355: select vertex path not working when vertices are selected with e.g.
border select. There was a fix before bmesh where it would require exactly two
vertices to be selected, but this was not ported over, and it also wasn't quite

This case should also work: click on two vertices, selected the path between
them, and then click on a 3rd vertex and select path, to extend the path further
from the 2nd to the 3rd vertex.

Now both use cases should work.

9 years agocode cleanup: more legacy compo functions ifdef'd
Campbell Barton [Tue, 21 Aug 2012 11:53:09 +0000 (11:53 +0000)]
code cleanup: more legacy compo functions ifdef'd

9 years agosvn merge ^/trunk/blender -r50076:50080
Campbell Barton [Tue, 21 Aug 2012 11:11:43 +0000 (11:11 +0000)]
svn merge ^/trunk/blender -r50076:50080

9 years agofix for bug with render slots - where the menus wouldnt only show layers from the...
Campbell Barton [Tue, 21 Aug 2012 11:10:16 +0000 (11:10 +0000)]
fix for bug with render slots - where the menus wouldnt only show layers from the last render which could be meaningless in different render slots.

9 years agoFix for
Jeroen Bakker [Tue, 21 Aug 2012 10:45:01 +0000 (10:45 +0000)]
Fix for
 * [#32356] Problem with "Ghost" in the "Glare" Node in Compositor

9 years agocode cleanup: minor changes to last commit.
Campbell Barton [Tue, 21 Aug 2012 10:44:10 +0000 (10:44 +0000)]
code cleanup: minor changes to last commit.

9 years agoMerging r50049 through r50076 from trunk into soc-2011-tomato
Sergey Sharybin [Tue, 21 Aug 2012 10:44:04 +0000 (10:44 +0000)]
Merging r50049 through r50076 from trunk into soc-2011-tomato

9 years agoSequencer: invalidate current frame cache on sequence transform
Sergey Sharybin [Tue, 21 Aug 2012 10:42:21 +0000 (10:42 +0000)]
Sequencer: invalidate current frame cache on sequence transform

9 years agocode cleanup: vfont's used confusing and over complicated method of storing memory...
Campbell Barton [Tue, 21 Aug 2012 10:39:02 +0000 (10:39 +0000)]
code cleanup: vfont's used confusing and over complicated method of storing memory for loaded fonts, not store as a temp var in the fonts.

9 years agoFix #32370: compiler error in wm_playanim.c due to conflicting Carbon ID type
Brecht Van Lommel [Tue, 21 Aug 2012 10:24:30 +0000 (10:24 +0000)]
Fix #32370: compiler error in wm_playanim.c due to conflicting Carbon ID type
from Quicktime headers. However the Quicktime init/exit is no longer needed
here, it happens in IMB_init/IMB_exit now, so removed that code.

9 years agocode cleanup: includes and correction for macro
Campbell Barton [Tue, 21 Aug 2012 09:45:30 +0000 (09:45 +0000)]
code cleanup: includes and correction for macro

9 years agomask: skip self intersection on drawing when fill is disabled, since it was only...
Campbell Barton [Tue, 21 Aug 2012 09:20:35 +0000 (09:20 +0000)]
mask: skip self intersection on drawing when fill is disabled, since it was only drawing on one side of an unfilled spline.

9 years agoFix cycles issue with non-progressive integrator and AO, setting AO samples > 1
Brecht Van Lommel [Tue, 21 Aug 2012 09:01:50 +0000 (09:01 +0000)]
Fix cycles issue with non-progressive integrator and AO, setting AO samples > 1
did not give properly normalized values.

9 years agocode cleanup: some legacy compo nodes were not ifdef'd
Campbell Barton [Tue, 21 Aug 2012 08:58:47 +0000 (08:58 +0000)]
code cleanup: some legacy compo nodes were not ifdef'd

9 years agoFix cycles continuously updating when creating a driver for a scene property,
Brecht Van Lommel [Tue, 21 Aug 2012 08:57:24 +0000 (08:57 +0000)]
Fix cycles continuously updating when creating a driver for a scene property,
like driving integrator seed with #frame.

The scene drivers are evaluated continuously, which would be nice to fix but
complicated, now it compares the RNA value to see if it actually changed, and
avoids the update in that case, which is a useful optimization by itself.

9 years agocode cleanup: don't use magic numbers for curve flag & use bool args for curvemapping...
Campbell Barton [Tue, 21 Aug 2012 08:47:36 +0000 (08:47 +0000)]
code cleanup: don't use magic numbers for curve flag & use bool args for curvemapping_changed()

9 years agocompositor color curve was MEM_dupallocN'ing the curve for every pixel calculation...
Campbell Barton [Tue, 21 Aug 2012 08:30:45 +0000 (08:30 +0000)]
compositor color curve was MEM_dupallocN'ing the curve for every pixel calculation (when there were black or white inputs on the curve node).

avoid allocation by using local vars for black/white storage & curve calculation.

9 years agocode cleanup: use math functions for curve compo code.
Campbell Barton [Tue, 21 Aug 2012 08:20:32 +0000 (08:20 +0000)]
code cleanup: use math functions for curve compo code.

9 years agocode cleanup: use BLI_RCT_SIZE macro
Campbell Barton [Mon, 20 Aug 2012 23:06:17 +0000 (23:06 +0000)]
code cleanup: use BLI_RCT_SIZE macro

9 years agoLegacy Compositor / Scons:
Thomas Dinges [Mon, 20 Aug 2012 20:13:37 +0000 (20:13 +0000)]
Legacy Compositor / Scons:
* Added WITH_BF_COMPOSITOR_LEGACY, enabled per default.

9 years agoCycles / Cmake:
Thomas Dinges [Mon, 20 Aug 2012 19:40:49 +0000 (19:40 +0000)]
Cycles / Cmake:
* Removed last instance of "BLENDER_PLUGIN" define, removed in r39465 in the cycles branch.

9 years agoHDR color picker now works in the clip space.
Campbell Barton [Mon, 20 Aug 2012 16:56:11 +0000 (16:56 +0000)]
HDR color picker now works in the clip space.

9 years agofix for mask feather intersection checks not working right for non-filled, feathered...
Campbell Barton [Mon, 20 Aug 2012 16:34:14 +0000 (16:34 +0000)]
fix for mask feather intersection checks not working right for non-filled, feathered masks.

now do intersection checks for both sides of the feather.

9 years agoSequencer: clear cache and animation buffers for strips outside of cursor when rendering
Sergey Sharybin [Mon, 20 Aug 2012 16:15:09 +0000 (16:15 +0000)]
Sequencer: clear cache and animation buffers for strips outside of cursor when rendering

This avoids having bunch of cached images when doing animation rendering,
keeping all the memory available for rendered itself.

This keeps memory usage low when rendering huge edits with mixed
scenes and movie strips.

This should not affect on sped of video encoding, which was confirmed by
some own tests.

Currently commiting to tomato due to not sure if there's something
i can not foresee here.

9 years agomacros for rectangle center and size
Campbell Barton [Mon, 20 Aug 2012 15:29:02 +0000 (15:29 +0000)]
macros for rectangle center and size

9 years agoMerging r50045 through r50048 from trunk into soc-2011-tomato
Sergey Sharybin [Mon, 20 Aug 2012 15:17:17 +0000 (15:17 +0000)]
Merging r50045 through r50048 from trunk into soc-2011-tomato

9 years agoSequencer: fix regression introduced in own previous commit
Sergey Sharybin [Mon, 20 Aug 2012 15:14:23 +0000 (15:14 +0000)]
Sequencer: fix regression introduced in own previous commit

Invalidate preprocessed cache when when global sequencer cache is
begin invalidated.

This is needed so scene would be rendered with a proper settings,
not taken from preprocess cache.

9 years agosvn merge ^/trunk/blender -r50039:50044
Campbell Barton [Mon, 20 Aug 2012 14:01:16 +0000 (14:01 +0000)]
svn merge ^/trunk/blender -r50039:50044

9 years agominor cleanup to node pasting.
Campbell Barton [Mon, 20 Aug 2012 13:59:19 +0000 (13:59 +0000)]
minor cleanup to node pasting.

9 years agofix for crash pasting nodes into a node tree when the ID pointer is lost.
Campbell Barton [Mon, 20 Aug 2012 13:51:25 +0000 (13:51 +0000)]
fix for crash pasting nodes into a node tree when the ID pointer is lost.
also fix for ID user count on paste which wasn't increasing.