Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-07-22 13:41:41 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-07-22 13:41:41 +0400
commitffb8ac01a262e8f81e4cf2730e8b81ccdad077ed (patch)
tree50164a24cd3b1c43d9c720949c02b7da1542a05f /source/blender/makesdna
parent53c1b562af9a0c8f66ae9f406fa2b50aee32a569 (diff)
remove scriptlinks,
they were not working and we have plans for better script integration in 2.5
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r--source/blender/makesdna/DNA_camera_types.h2
-rw-r--r--source/blender/makesdna/DNA_lamp_types.h3
-rw-r--r--source/blender/makesdna/DNA_material_types.h3
-rw-r--r--source/blender/makesdna/DNA_object_types.h2
-rw-r--r--source/blender/makesdna/DNA_scene_types.h3
-rw-r--r--source/blender/makesdna/DNA_screen_types.h3
-rw-r--r--source/blender/makesdna/DNA_scriptlink_types.h79
-rw-r--r--source/blender/makesdna/DNA_world_types.h3
-rw-r--r--source/blender/makesdna/intern/makesdna.c2
9 files changed, 0 insertions, 100 deletions
diff --git a/source/blender/makesdna/DNA_camera_types.h b/source/blender/makesdna/DNA_camera_types.h
index 8ba7fa8b58d..3d839570e17 100644
--- a/source/blender/makesdna/DNA_camera_types.h
+++ b/source/blender/makesdna/DNA_camera_types.h
@@ -32,7 +32,6 @@
#define DNA_CAMERA_TYPES_H
#include "DNA_ID.h"
-#include "DNA_scriptlink_types.h"
#ifdef __cplusplus
extern "C" {
@@ -61,7 +60,6 @@ typedef struct Camera {
struct Ipo *ipo; // XXX depreceated... old animation system
- ScriptLink scriptlink;
struct Object *dof_ob;
} Camera;
diff --git a/source/blender/makesdna/DNA_lamp_types.h b/source/blender/makesdna/DNA_lamp_types.h
index a1059038777..78c8d1a5607 100644
--- a/source/blender/makesdna/DNA_lamp_types.h
+++ b/source/blender/makesdna/DNA_lamp_types.h
@@ -32,7 +32,6 @@
#define DNA_LAMP_TYPES_H
#include "DNA_ID.h"
-#include "DNA_scriptlink_types.h"
#ifndef MAX_MTEX
#define MAX_MTEX 18
@@ -110,8 +109,6 @@ typedef struct Lamp {
/* preview */
struct PreviewImage *preview;
-
- ScriptLink scriptlink;
} Lamp;
/* **************** LAMP ********************* */
diff --git a/source/blender/makesdna/DNA_material_types.h b/source/blender/makesdna/DNA_material_types.h
index a2ead6fc33d..1f93bcf1317 100644
--- a/source/blender/makesdna/DNA_material_types.h
+++ b/source/blender/makesdna/DNA_material_types.h
@@ -32,7 +32,6 @@
#define DNA_MATERIAL_TYPES_H
#include "DNA_ID.h"
-#include "DNA_scriptlink_types.h"
#include "DNA_listBase.h"
#ifndef MAX_MTEX
@@ -134,8 +133,6 @@ typedef struct Material {
/* yafray: absorption color, dispersion parameters and material preset menu */
float YF_ar, YF_ag, YF_ab, YF_dscale, YF_dpwr;
int YF_dsmp, YF_preset, YF_djit;
-
- ScriptLink scriptlink;
ListBase gpumaterial; /* runtime */
} Material;
diff --git a/source/blender/makesdna/DNA_object_types.h b/source/blender/makesdna/DNA_object_types.h
index 2b0ede846af..ec4cad5c3b4 100644
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@ -35,7 +35,6 @@
#include "DNA_listBase.h"
#include "DNA_ID.h"
-#include "DNA_scriptlink_types.h"
#ifdef __cplusplus
extern "C" {
@@ -172,7 +171,6 @@ typedef struct Object {
float empty_drawsize;
float dupfacesca; /* dupliface scale */
- ScriptLink scriptlink;
ListBase prop;
ListBase sensors;
ListBase controllers;
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 60176dd5e6e..c8d0fc9ff5e 100644
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -36,7 +36,6 @@ extern "C" {
#include "DNA_brush_types.h"
#include "DNA_vec_types.h"
#include "DNA_listBase.h"
-#include "DNA_scriptlink_types.h"
#include "DNA_ID.h"
struct Object;
@@ -660,8 +659,6 @@ typedef struct Scene {
struct RenderData r;
struct AudioData audio; /* DEPRECATED 2.5 */
- ScriptLink scriptlink;
-
ListBase markers;
ListBase transform_spaces;
diff --git a/source/blender/makesdna/DNA_screen_types.h b/source/blender/makesdna/DNA_screen_types.h
index 1be75e97735..cf107230171 100644
--- a/source/blender/makesdna/DNA_screen_types.h
+++ b/source/blender/makesdna/DNA_screen_types.h
@@ -31,7 +31,6 @@
#include "DNA_view2d_types.h"
#include "DNA_vec_types.h"
-#include "DNA_scriptlink_types.h"
#include "DNA_ID.h"
struct SpaceType;
@@ -125,8 +124,6 @@ typedef struct ScrArea {
short pad;
short do_refresh; /* private, for spacetype refresh callback */
short cursor, flag;
-
- ScriptLink scriptlink;
struct SpaceType *type; /* callbacks for this space type */
diff --git a/source/blender/makesdna/DNA_scriptlink_types.h b/source/blender/makesdna/DNA_scriptlink_types.h
deleted file mode 100644
index 9b50eb91a20..00000000000
--- a/source/blender/makesdna/DNA_scriptlink_types.h
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * blenlib/DNA_object_types.h (mar-2001 nzc)
- *
- * Scriptlink is hard-coded in object for some reason.
- *
- * $Id$
- *
- * ***** 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.
- *
- * 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.
- *
- * The Original Code is: all of this file.
- *
- * Contributor(s): none yet.
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-#ifndef DNA_SCRIPTLINK_TYPES_H
-#define DNA_SCRIPTLINK_TYPES_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-struct ID;
-
-typedef struct ScriptLink {
- struct ID **scripts;
- short *flag;
-
- short actscript, totscript;
- int pad;
-} ScriptLink;
-
-/* **************** SCRIPTLINKS ********************* */
-
-#define SCRIPT_FRAMECHANGED 1
-#define SCRIPT_ONLOAD 2
-#define SCRIPT_REDRAW 4
-#define SCRIPT_ONSAVE 8
-#define SCRIPT_RENDER 16
-/* POSTRENDER is not meant for the UI, it simply calls the
- * RENDER script links for clean-up actions */
-#define SCRIPT_POSTRENDER 32
-
-#define SCRIPT_OBJECTUPDATE 64
-#define SCRIPT_OBDATAUPDATE 128
-
-/* **************** SPACE HANDLERS ********************* */
-/* these are special scriptlinks that can be assigned to
- * a given space in a given ScrArea to:
- * - (EVENT type) handle events sent to that space;
- * - (EVENT_ALL type): handle release events, too;
- * - (DRAW type) draw on the space after its own drawing function finishes.
- */
-#define SPACEHANDLER_VIEW3D_DRAW 1
-#define SPACEHANDLER_VIEW3D_EVENT 2
-#define SPACEHANDLER_VIEW3D_EVENT_ALL 3
-
-
-#ifdef __cplusplus
-}
-#endif
-#endif
diff --git a/source/blender/makesdna/DNA_world_types.h b/source/blender/makesdna/DNA_world_types.h
index 31f0727cf73..200ff6d9324 100644
--- a/source/blender/makesdna/DNA_world_types.h
+++ b/source/blender/makesdna/DNA_world_types.h
@@ -32,7 +32,6 @@
#define DNA_WORLD_TYPES_H
#include "DNA_ID.h"
-#include "DNA_scriptlink_types.h"
struct AnimData;
struct Ipo;
@@ -124,8 +123,6 @@ typedef struct World {
/* previews */
struct PreviewImage *preview;
- ScriptLink scriptlink;
-
} World;
/* **************** WORLD ********************* */
diff --git a/source/blender/makesdna/intern/makesdna.c b/source/blender/makesdna/intern/makesdna.c
index ffd164baaaf..207d6fdd94a 100644
--- a/source/blender/makesdna/intern/makesdna.c
+++ b/source/blender/makesdna/intern/makesdna.c
@@ -76,7 +76,6 @@ char *includefiles[] = {
"DNA_ID.h",
"DNA_ipo_types.h",
"DNA_key_types.h",
- "DNA_scriptlink_types.h",
"DNA_text_types.h",
"DNA_packedFile_types.h",
"DNA_camera_types.h",
@@ -1105,7 +1104,6 @@ int main(int argc, char ** argv)
#include "DNA_ID.h"
#include "DNA_ipo_types.h"
#include "DNA_key_types.h"
-#include "DNA_scriptlink_types.h"
#include "DNA_text_types.h"
#include "DNA_packedFile_types.h"
#include "DNA_camera_types.h"