diff options
author | Ton Roosendaal <ton@blender.org> | 2005-12-18 16:46:01 +0300 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2005-12-18 16:46:01 +0300 |
commit | e14ff3de3d4a2c9ee11ea53dde4a3a0e33395c0b (patch) | |
tree | 04cf3f1c27eecc66086394118ae80a180d2c4e1f /source/blender/src/edittime.c | |
parent | 510403277be6c5b34d01b386bfbf66871348f555 (diff) |
Orange:
- Sunday merger with bf-blender
- Foundations for new Node editor in Blender, generic framework that can
be used for Material/Texture, Compositing, Logic or maybe even Sequencer.
Note: this doesn't do anything yet, nor save! Is just to get this nice
in CVS now. :)
Diffstat (limited to 'source/blender/src/edittime.c')
-rw-r--r-- | source/blender/src/edittime.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/source/blender/src/edittime.c b/source/blender/src/edittime.c index 26aa3e1cbae..48c65a29cd9 100644 --- a/source/blender/src/edittime.c +++ b/source/blender/src/edittime.c @@ -1,15 +1,12 @@ /** * $Id: * - * ***** BEGIN GPL/BL DUAL LICENSE BLOCK ***** + * ***** BEGIN GPL LICENSE BLOCK ***** * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. The Blender - * Foundation also sells licenses for use in proprietary software under - * the Blender License. See http://www.blender.org/BL/ for information - * about this. + * of the License, or (at your option) any later version. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -27,7 +24,7 @@ * * Contributor(s): none yet. * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** + * ***** END GPL LICENSE BLOCK ***** */ #include <stdio.h> |