Joseph Eagar f026266e18 merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that. ...

[[Split portion of a mixed commit.]]

2009-05-23 03:24:15 +00:00

..

CMP_alphaOver.c

Bugfix for recent alphaover premul commit, crashed existing files

2008-02-04 21:17:15 +00:00

CMP_bilateralblur.c

* Fix for bilateral blur node

2008-01-22 06:27:27 +00:00

CMP_blur.c

2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r18677:19317

2009-03-17 21:44:58 +00:00

CMP_brightness.c

Tweaks to labels on brightness/contrast node

2008-03-25 06:10:03 +00:00

CMP_channelMatte.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_chromaMatte.c

== MSVC 7.1 projectfiles ==

2007-11-27 21:48:14 +00:00

CMP_colorSpill.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_composite.c

2.5

2009-02-05 19:28:28 +00:00

CMP_crop.c

Crop Compositing Node:

2007-10-29 14:37:19 +00:00

CMP_curves.c

2.5

2009-01-04 14:14:06 +00:00

CMP_defocus.c

2.5

2009-01-04 14:14:06 +00:00

CMP_diffMatte.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_dilate.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_directionalblur.c

Directional Blur Node

2007-12-27 14:19:11 +00:00

CMP_displace.c

Fix for bug #7068: displace node crashes with procedural

2008-05-09 15:32:55 +00:00

CMP_filter.c

2.5

2009-02-17 13:37:06 +00:00

CMP_flip.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_gamma.c

Fix for bugfix #12075: gamma node check for nan was always

2008-07-09 10:13:09 +00:00

CMP_glare.c

* fix for [#8085] Glare node crashes on inputs with < 4 colour channels

2008-02-13 13:36:35 +00:00

CMP_hueSatVal.c

Fix for bug #11005: hue-sat-value node was doing unnecessary

2008-05-08 19:57:10 +00:00

CMP_idMask.c

New rendering option: FSA!

2008-01-28 16:33:59 +00:00

CMP_image.c

2.5

2009-01-04 14:14:06 +00:00

CMP_invert.c

fix svn properties for line endings

2007-09-05 17:55:44 +00:00

CMP_lensdist.c

nodes from eechlo

2007-10-26 15:32:36 +00:00

CMP_lummaMatte.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_mapUV.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_mapValue.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_math.c

Fix for bug [#13651] Convertor->Math->Divide broken

2008-06-26 17:08:07 +00:00

CMP_mixrgb.c

2.5

2009-02-17 13:37:06 +00:00

CMP_normal.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_normalize.c

merge with 2.5 at r20307. note there were some python hacking necassary for this to work, so um hopefully there's not too much cruft from that.

2009-05-23 03:24:15 +00:00

CMP_outputFile.c

2.5

2009-01-04 14:14:06 +00:00

CMP_premulkey.c

Added an Alpha Convert compositor node, to convert between

2008-03-11 14:40:27 +00:00

CMP_rgb.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_rotate.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_scale.c

* New feature on compo scale node: "Scene Size %"

2007-11-13 23:53:58 +00:00

CMP_sepcombHSVA.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_sepcombRGBA.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_sepcombYCCA.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_sepcombYUVA.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_setalpha.c

== Shader nodes ==

2007-05-31 06:55:02 +00:00

CMP_splitViewer.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_texture.c

2.5

2009-01-04 14:14:06 +00:00

CMP_tonemap.c

Bugfix #13837

2008-09-09 10:16:09 +00:00

CMP_translate.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_valToRgb.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_value.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_vecBlur.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_viewer.c

=== Node editor ===

2007-04-04 13:58:12 +00:00

CMP_zcombine.c

1) Revert previous commit, rendering negative won't work that simple...

2008-02-14 18:56:14 +00:00

Makefile

Merge of trunk into blender 2.5:

2008-11-12 21:16:53 +00:00