c8b48e70e6
Here are my notes on things to look out for as potential problem spots: source/blender/blenkernel/intern/displist.c: + is initfastshade(void) supposed to be empty? I had to make it empty to get the merged tree to compile. source/blender/python/api2_2x/Armature.c: + went with the version that had Armature_getLayers() source/blender/python/api2_2x/Object.c + went with the version of Object_getPose() from bf-blender. (#ifdef 0-ed the other version) source/blender/python/api2_2x/Pose.[ch] + had problems linking due to no Pose_Init() ... copied these two files straight from bf-blender. source/blender/src/drawview.c: + view3d_panel_properties() had things shifted a few things shifted a few pixels, otherwise, things were painless source/blender/src/splash.jpg.c: + went with bf-blender version (orange is dead) source/gameengine: + went with bf-blender version -- does not compile due to IMB_rect* stuff, Ton should look into this.
76 lines
2.2 KiB
C++
76 lines
2.2 KiB
C++
/*
|
|
* $Id$
|
|
*
|
|
* ***** BEGIN GPL/BL DUAL 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.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software Foundation,
|
|
* Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
* All rights reserved.
|
|
*
|
|
* Contributor(s): Joseph Gilbert
|
|
*
|
|
* ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
*/
|
|
|
|
#ifndef EXPP_BONE_H
|
|
#define EXPP_BONE_H
|
|
|
|
#include <Python.h>
|
|
#include "DNA_armature_types.h"
|
|
|
|
//-------------------TYPE CHECKS---------------------------------
|
|
#define BoneObject_Check(v) ((v)->ob_type == &Bone_Type)
|
|
#define EditBoneObject_Check(v) ((v)->ob_type == &EditBone_Type)
|
|
//-------------------TYPEOBJECT----------------------------------
|
|
extern PyTypeObject EditBone_Type;
|
|
extern PyTypeObject Bone_Type;
|
|
//-------------------STRUCT DEFINITION----------------------------
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
Bone * bone;
|
|
} BPy_Bone;
|
|
|
|
typedef struct {
|
|
PyObject_HEAD
|
|
struct EditBone *editbone;
|
|
struct EditBone *parent;
|
|
char name[32];
|
|
float roll;
|
|
float head[3];
|
|
float tail[3];
|
|
int flag;
|
|
float dist;
|
|
float weight;
|
|
float xwidth;
|
|
float zwidth;
|
|
float ease1;
|
|
float ease2;
|
|
float rad_head;
|
|
float rad_tail;
|
|
short segments;
|
|
} BPy_EditBone;
|
|
//-------------------VISIBLE PROTOTYPES-------------------------
|
|
PyObject *PyBone_FromBone(struct Bone *bone);
|
|
struct Bone *PyBone_AsBone(BPy_Bone *py_Bone);
|
|
PyObject *PyEditBone_FromBone(Bone *bone);
|
|
PyObject *PyEditBone_FromEditBone(struct EditBone *editbone);
|
|
|
|
#endif
|