svn merge ^/trunk/blender -r41227:41230 . --accept=theirs-full

This commit is contained in:
Campbell Barton 2011-10-24 22:18:32 +00:00
commit 685b6e7db9
94 changed files with 106 additions and 119 deletions

@ -1,6 +1,6 @@
# -*- mode: gnumakefile; tab-width: 8; indent-tabs-mode: t; -*-
# vim: tabstop=8
# $Id$
# $Id: GNUmakefile 41122 2011-10-19 21:55:27Z campbellbarton $
#
# ##### BEGIN GPL LICENSE BLOCK #####
#

@ -1,5 +1,5 @@
#!/usr/bin/env python
# $Id$
# $Id: SConstruct 41169 2011-10-21 04:23:26Z campbellbarton $
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,4 +1,3 @@
$Id$
Blender CMake build system
============================

@ -1,5 +1,3 @@
$Id$
Internals of Blenders SCons scripts
===================================

@ -1,4 +1,3 @@
$Id$
Blenders SCons build scripts
============================

@ -29,7 +29,7 @@ subject to the following restrictions:
#include <cfloat>
#include <float.h>
/* SVN $Revision$ on $Date$ from http://bullet.googlecode.com*/
/* SVN $Revision: 35500 $ on $Date: 2011-03-12 21:34:17 +0100 (Sat, 12 Mar 2011) $ from http://bullet.googlecode.com*/
#define BT_BULLET_VERSION 278
inline int btGetVersion()

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
/*
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN LGPL LICENSE BLOCK *****
#
# Copyright 2009 Jrg Hermann Mller

@ -12,7 +12,6 @@
* - $log$
*
* \par Release
* $Id: frameacc.inl 19905 2009-04-23 13:29:54Z ben2610 $
* $Name: $
****************************************************************************/

@ -12,7 +12,6 @@
* - $log$
*
* \par Release
* $Id: framevel.inl 19905 2009-04-23 13:29:54Z ben2610 $
* $Name: $
****************************************************************************/

@ -2,8 +2,6 @@
* \ingroup opennlextern
*/
/*
* $Id$
*
* OpenNL: Numerical Library
* Copyright (C) 2004 Bruno Levy
*

@ -2,7 +2,6 @@
* \ingroup opennlintern
*/
/*
* $Id$
*
* OpenNL: Numerical Library
* Copyright (C) 2004 Bruno Levy

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,4 +1,3 @@
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,6 +1,5 @@
#!/usr/bin/env python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -98,4 +98,3 @@ dealings in this Font Software without prior written authorization
from Tavmjong Bah. For further information, contact: tavmjong @ free
. fr.
$Id$

@ -1,6 +1,3 @@
#
# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,7 +1,5 @@
#!/bin/sh
#
# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
/**
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/**
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,6 +1,3 @@
#
# $Id$
#
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
/**
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/**
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
;
; $Id$
;
; Blender Self-Installer for Windows (NSIS - http://nsis.sourceforge.net)
;

@ -1,4 +1,3 @@
# $Id $
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
#!/usr/bin/python
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
# This program is free software; you can redistribute it and/or

@ -48,7 +48,7 @@
* numbers give more output.
* */
#define DNA_VERSION_DATE "$Id$"
#define DNA_VERSION_DATE "FIXME-DNA_VERSION_DATE"
#include <string.h>
#include <stdlib.h>

@ -40,7 +40,7 @@
#include "rna_internal.h"
#define RNA_VERSION_DATE "$Id$"
#define RNA_VERSION_DATE "FIXME-RNA_VERSION_DATE"
#ifdef _WIN32
#ifndef snprintf

@ -1,6 +1,4 @@
/*
* $Id: mathutils.c 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
/*
* $Id: mathutils.h 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Color.c 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Color.h 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Euler.c 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Euler.h 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id$
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Matrix.h 38409 2011-07-15 04:01:47Z campbellbarton $
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or

@ -1,6 +1,4 @@
/*
* $Id: mathutils_Quaternion.c 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Quaternion.h 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Vector.c 38409 2011-07-15 04:01:47Z campbellbarton $
* ***** BEGIN GPL LICENSE BLOCK *****
*
* This program is free software; you can redistribute it and/or

@ -1,5 +1,4 @@
/*
* $Id: mathutils_Vector.h 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_geometry.c 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,5 +1,4 @@
/*
* $Id: mathutils_geometry.h 38409 2011-07-15 04:01:47Z campbellbarton $
*
* ***** BEGIN GPL LICENSE BLOCK *****
*

@ -1,6 +1,4 @@
/** \file gameengine/Ketsji/KX_Dome.cpp
* \ingroup ketsji
*/
/*
-----------------------------------------------------------------------------
This program is free software; you can redistribute it and/or modify it under
@ -24,6 +22,10 @@ Developed as part of a Research and Development project for SAT - La Société d
-----------------------------------------------------------------------------
*/
/** \file gameengine/Ketsji/KX_Dome.cpp
* \ingroup ketsji
*/
#include "KX_Dome.h"
#ifdef WITH_PYTHON

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This program is free software; you can redistribute it and/or modify it under

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/Exception.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,9 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/Exception.cpp
* \ingroup bgevideotex
*/
#include <sstream>
#include <fstream>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/FilterBase.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,11 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/FilterBase.cpp
* \ingroup bgevideotex
*/
#include "FilterBase.h"
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/FilterBlueScreen.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,9 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/FilterBlueScreen.cpp
* \ingroup bgevideotex
*/
#include <PyObjectPlus.h>
#include <structmember.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/FilterColor.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,9 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/FilterColor.cpp
* \ingroup bgevideotex
*/
#include <PyObjectPlus.h>
#include <structmember.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/FilterNormal.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,9 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/FilterNormal.cpp
* \ingroup bgevideotex
*/
#include <PyObjectPlus.h>
#include <structmember.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/FilterSource.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/FilterSource.cpp
* \ingroup bgevideotex
*/
// implementation
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/ImageBase.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/ImageBase.cpp
* \ingroup bgevideotex
*/
#include "ImageBase.h"
extern "C" {
#include "bgl.h"

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/ImageBuff.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/ImageBuff.cpp
* \ingroup bgevideotex
*/
// implementation
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/ImageMix.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,11 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/ImageMix.cpp
* \ingroup bgevideotex
*/
// implementation
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/ImageRender.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/ImageRender.cpp
* \ingroup bgevideotex
*/
// implementation
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/ImageViewport.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/ImageViewport.cpp
* \ingroup bgevideotex
*/
// implementation
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/PyTypeList.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library
@ -22,6 +20,9 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/PyTypeList.cpp
* \ingroup bgevideotex
*/
#include "PyTypeList.h"

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of blendTex library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/Texture.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/Texture.cpp
* \ingroup bgevideotex
*/
// implementation
#include <PyObjectPlus.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/VideoBase.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/VideoBase.cpp
* \ingroup bgevideotex
*/
#if defined WIN32
#define WINDOWS_LEAN_AND_MEAN
#include <windows.h>

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/VideoFFmpeg.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,11 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/VideoFFmpeg.cpp
* \ingroup bgevideotex
*/
#ifdef WITH_FFMPEG
// INT64_C fix for some linux machines (C99ism)

@ -1,3 +1,4 @@
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library

@ -1,6 +1,4 @@
/** \file gameengine/VideoTexture/blendVideoTex.cpp
* \ingroup bgevideotex
*/
/*
-----------------------------------------------------------------------------
This source file is part of VideoTexture library
@ -22,6 +20,10 @@ http://www.gnu.org/copyleft/lesser.txt.
-----------------------------------------------------------------------------
*/
/** \file gameengine/VideoTexture/blendVideoTex.cpp
* \ingroup bgevideotex
*/
#include <PyObjectPlus.h>
#include <RAS_GLExtensionManager.h>