From 58bf29e3898292ad9b46b7c0a591c856dde6eacb Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 1 Jan 2008 18:16:10 +0000 Subject: removed blenderdef.h, BIF_*, BDR_* and BSE_* header files (except for BIF_gl.h and BIF_glutil.h) --- source/blender/blenkernel/BKE_bad_level_calls.h | 56 -- source/blender/blenkernel/BKE_scene.h | 1 + source/blender/blenkernel/intern/anim.c | 6 +- source/blender/blenkernel/intern/armature.c | 2 +- source/blender/blenkernel/intern/constraint.c | 2 - source/blender/blenkernel/intern/depsgraph.c | 1 - source/blender/blenkernel/intern/displist.c | 5 +- source/blender/blenkernel/intern/effect.c | 4 +- source/blender/blenkernel/intern/exotic.c | 111 ++-- source/blender/blenkernel/intern/font.c | 5 +- source/blender/blenkernel/intern/image.c | 10 +- source/blender/blenkernel/intern/ipo.c | 3 +- source/blender/blenkernel/intern/key.c | 3 - source/blender/blenkernel/intern/lattice.c | 4 +- source/blender/blenkernel/intern/library.c | 1 - source/blender/blenkernel/intern/material.c | 3 +- source/blender/blenkernel/intern/mball.c | 1 - source/blender/blenkernel/intern/mesh.c | 1 - source/blender/blenkernel/intern/modifier.c | 3 +- .../blenkernel/intern/multires-firstlevel.c | 8 +- source/blender/blenkernel/intern/multires.c | 19 +- source/blender/blenkernel/intern/object.c | 3 +- source/blender/blenkernel/intern/packedFile.c | 19 +- source/blender/blenkernel/intern/particle.c | 9 +- source/blender/blenkernel/intern/particle_system.c | 2 +- source/blender/blenkernel/intern/pointcache.c | 1 - source/blender/blenkernel/intern/property.c | 2 - source/blender/blenkernel/intern/sca.c | 1 - source/blender/blenkernel/intern/scene.c | 7 +- source/blender/blenkernel/intern/screen.c | 3 +- source/blender/blenkernel/intern/softbody.c | 4 +- source/blender/blenkernel/intern/subsurf_ccg.c | 5 +- source/blender/blenkernel/intern/text.c | 13 +- source/blender/blenkernel/intern/texture.c | 5 +- source/blender/blenkernel/intern/verse_method.c | 1 - source/blender/blenkernel/intern/world.c | 1 - source/blender/blenkernel/intern/writeffmpeg.c | 2 - .../blender/blenkernel/intern/writeframeserver.c | 10 +- source/blender/blenlib/BLI_storage_types.h | 12 + source/blender/blenlib/intern/bpath.c | 1 - source/blender/blenlib/intern/freetypefont.c | 6 +- source/blender/blenloader/intern/readfile.c | 125 +++-- source/blender/blenloader/intern/writefile.c | 7 +- source/blender/editors/include/BDR_drawaction.h | 88 --- source/blender/editors/include/BDR_drawmesh.h | 84 --- source/blender/editors/include/BDR_drawobject.h | 82 --- source/blender/editors/include/BDR_editcurve.h | 105 ---- source/blender/editors/include/BDR_editface.h | 61 --- source/blender/editors/include/BDR_editmball.h | 56 -- source/blender/editors/include/BDR_editobject.h | 128 ----- source/blender/editors/include/BDR_imagepaint.h | 44 -- source/blender/editors/include/BDR_sculptmode.h | 90 ---- source/blender/editors/include/BDR_unwrapper.h | 51 -- source/blender/editors/include/BDR_vpaint.h | 58 -- source/blender/editors/include/BIF_butspace.h | 140 ----- source/blender/editors/include/BIF_cursors.h | 103 ---- source/blender/editors/include/BIF_drawimage.h | 74 --- source/blender/editors/include/BIF_drawoops.h | 41 -- source/blender/editors/include/BIF_drawscene.h | 35 -- source/blender/editors/include/BIF_drawscript.h | 41 -- source/blender/editors/include/BIF_drawseq.h | 46 -- source/blender/editors/include/BIF_drawtext.h | 54 -- source/blender/editors/include/BIF_editaction.h | 162 ------ source/blender/editors/include/BIF_editarmature.h | 142 ----- .../blender/editors/include/BIF_editconstraint.h | 72 --- source/blender/editors/include/BIF_editdeform.h | 76 --- source/blender/editors/include/BIF_editfont.h | 73 --- source/blender/editors/include/BIF_editgroup.h | 40 -- source/blender/editors/include/BIF_editkey.h | 70 --- source/blender/editors/include/BIF_editlattice.h | 45 -- source/blender/editors/include/BIF_editmesh.h | 265 --------- source/blender/editors/include/BIF_editmode_undo.h | 59 -- source/blender/editors/include/BIF_editnla.h | 65 --- source/blender/editors/include/BIF_editoops.h | 47 -- source/blender/editors/include/BIF_editparticle.h | 92 ---- source/blender/editors/include/BIF_editsca.h | 41 -- source/blender/editors/include/BIF_editseq.h | 135 ----- source/blender/editors/include/BIF_editsima.h | 112 ---- source/blender/editors/include/BIF_editsound.h | 87 --- source/blender/editors/include/BIF_editview.h | 61 --- source/blender/editors/include/BIF_filelist.h | 86 --- source/blender/editors/include/BIF_fsmenu.h | 76 --- source/blender/editors/include/BIF_graphics.h | 59 -- source/blender/editors/include/BIF_imasel.h | 51 -- source/blender/editors/include/BIF_interface.h | 331 ------------ .../blender/editors/include/BIF_interface_icons.h | 72 --- source/blender/editors/include/BIF_keyval.h | 39 -- source/blender/editors/include/BIF_language.h | 69 --- source/blender/editors/include/BIF_mainqueue.h | 47 -- source/blender/editors/include/BIF_meshlaplacian.h | 87 --- source/blender/editors/include/BIF_meshtools.h | 51 -- source/blender/editors/include/BIF_mywindow.h | 145 ----- source/blender/editors/include/BIF_oops.h | 71 --- source/blender/editors/include/BIF_outliner.h | 106 ---- source/blender/editors/include/BIF_poseobject.h | 71 --- source/blender/editors/include/BIF_previewrender.h | 94 ---- source/blender/editors/include/BIF_renderwin.h | 67 --- source/blender/editors/include/BIF_resources.h | 600 --------------------- source/blender/editors/include/BIF_retopo.h | 110 ---- source/blender/editors/include/BIF_scrarea.h | 54 -- source/blender/editors/include/BIF_screen.h | 137 ----- source/blender/editors/include/BIF_space.h | 148 ----- source/blender/editors/include/BIF_spacetypes.h | 67 --- source/blender/editors/include/BIF_tbcallback.h | 42 -- source/blender/editors/include/BIF_toets.h | 41 -- source/blender/editors/include/BIF_toolbox.h | 68 --- source/blender/editors/include/BIF_transform.h | 110 ---- source/blender/editors/include/BIF_usiblender.h | 54 -- source/blender/editors/include/BIF_verse.h | 142 ----- source/blender/editors/include/BIF_writeavicodec.h | 44 -- source/blender/editors/include/BIF_writeimage.h | 45 -- source/blender/editors/include/BIF_writemovie.h | 41 -- source/blender/editors/include/BSE_drawimasel.h | 60 --- source/blender/editors/include/BSE_drawipo.h | 76 --- source/blender/editors/include/BSE_drawnla.h | 52 -- source/blender/editors/include/BSE_drawoops.h | 50 -- source/blender/editors/include/BSE_drawview.h | 88 --- source/blender/editors/include/BSE_edit.h | 55 -- .../blender/editors/include/BSE_editaction_types.h | 77 --- source/blender/editors/include/BSE_editipo.h | 179 ------ source/blender/editors/include/BSE_editipo_types.h | 53 -- source/blender/editors/include/BSE_editnla_types.h | 41 -- source/blender/editors/include/BSE_filesel.h | 66 --- source/blender/editors/include/BSE_headerbuttons.h | 158 ------ source/blender/editors/include/BSE_node.h | 137 ----- source/blender/editors/include/BSE_seqaudio.h | 53 -- source/blender/editors/include/BSE_seqeffects.h | 96 ---- source/blender/editors/include/BSE_seqscopes.h | 38 -- source/blender/editors/include/BSE_sequence.h | 89 --- source/blender/editors/include/BSE_time.h | 71 --- source/blender/editors/include/BSE_trans_types.h | 90 ---- source/blender/editors/include/BSE_types.h | 69 --- source/blender/editors/include/BSE_view.h | 97 ---- source/blender/editors/include/blendef.h | 465 ---------------- source/blender/makesdna/DNA_scene_types.h | 28 + source/blender/nodes/intern/CMP_util.h | 13 - source/blender/nodes/intern/SHD_util.h | 17 +- .../blender/radiosity/intern/source/radfactors.c | 16 +- .../radiosity/intern/source/radpreprocess.c | 4 +- .../blender/render/intern/source/convertblender.c | 1 - source/blender/render/intern/source/pipeline.c | 4 +- source/blender/windowmanager/intern/wm_subwindow.c | 2 +- source/creator/creator.c | 4 - 143 files changed, 236 insertions(+), 8751 deletions(-) delete mode 100644 source/blender/blenkernel/BKE_bad_level_calls.h delete mode 100644 source/blender/editors/include/BDR_drawaction.h delete mode 100644 source/blender/editors/include/BDR_drawmesh.h delete mode 100644 source/blender/editors/include/BDR_drawobject.h delete mode 100644 source/blender/editors/include/BDR_editcurve.h delete mode 100644 source/blender/editors/include/BDR_editface.h delete mode 100644 source/blender/editors/include/BDR_editmball.h delete mode 100644 source/blender/editors/include/BDR_editobject.h delete mode 100644 source/blender/editors/include/BDR_imagepaint.h delete mode 100644 source/blender/editors/include/BDR_sculptmode.h delete mode 100644 source/blender/editors/include/BDR_unwrapper.h delete mode 100644 source/blender/editors/include/BDR_vpaint.h delete mode 100644 source/blender/editors/include/BIF_butspace.h delete mode 100644 source/blender/editors/include/BIF_cursors.h delete mode 100644 source/blender/editors/include/BIF_drawimage.h delete mode 100644 source/blender/editors/include/BIF_drawoops.h delete mode 100644 source/blender/editors/include/BIF_drawscene.h delete mode 100644 source/blender/editors/include/BIF_drawscript.h delete mode 100644 source/blender/editors/include/BIF_drawseq.h delete mode 100644 source/blender/editors/include/BIF_drawtext.h delete mode 100644 source/blender/editors/include/BIF_editaction.h delete mode 100644 source/blender/editors/include/BIF_editarmature.h delete mode 100644 source/blender/editors/include/BIF_editconstraint.h delete mode 100644 source/blender/editors/include/BIF_editdeform.h delete mode 100644 source/blender/editors/include/BIF_editfont.h delete mode 100644 source/blender/editors/include/BIF_editgroup.h delete mode 100644 source/blender/editors/include/BIF_editkey.h delete mode 100644 source/blender/editors/include/BIF_editlattice.h delete mode 100644 source/blender/editors/include/BIF_editmesh.h delete mode 100644 source/blender/editors/include/BIF_editmode_undo.h delete mode 100644 source/blender/editors/include/BIF_editnla.h delete mode 100644 source/blender/editors/include/BIF_editoops.h delete mode 100644 source/blender/editors/include/BIF_editparticle.h delete mode 100644 source/blender/editors/include/BIF_editsca.h delete mode 100644 source/blender/editors/include/BIF_editseq.h delete mode 100644 source/blender/editors/include/BIF_editsima.h delete mode 100644 source/blender/editors/include/BIF_editsound.h delete mode 100644 source/blender/editors/include/BIF_editview.h delete mode 100644 source/blender/editors/include/BIF_filelist.h delete mode 100644 source/blender/editors/include/BIF_fsmenu.h delete mode 100644 source/blender/editors/include/BIF_graphics.h delete mode 100644 source/blender/editors/include/BIF_imasel.h delete mode 100644 source/blender/editors/include/BIF_interface.h delete mode 100644 source/blender/editors/include/BIF_interface_icons.h delete mode 100644 source/blender/editors/include/BIF_keyval.h delete mode 100644 source/blender/editors/include/BIF_language.h delete mode 100644 source/blender/editors/include/BIF_mainqueue.h delete mode 100644 source/blender/editors/include/BIF_meshlaplacian.h delete mode 100644 source/blender/editors/include/BIF_meshtools.h delete mode 100644 source/blender/editors/include/BIF_mywindow.h delete mode 100644 source/blender/editors/include/BIF_oops.h delete mode 100644 source/blender/editors/include/BIF_outliner.h delete mode 100644 source/blender/editors/include/BIF_poseobject.h delete mode 100644 source/blender/editors/include/BIF_previewrender.h delete mode 100644 source/blender/editors/include/BIF_renderwin.h delete mode 100644 source/blender/editors/include/BIF_resources.h delete mode 100644 source/blender/editors/include/BIF_retopo.h delete mode 100644 source/blender/editors/include/BIF_scrarea.h delete mode 100644 source/blender/editors/include/BIF_screen.h delete mode 100644 source/blender/editors/include/BIF_space.h delete mode 100644 source/blender/editors/include/BIF_spacetypes.h delete mode 100644 source/blender/editors/include/BIF_tbcallback.h delete mode 100644 source/blender/editors/include/BIF_toets.h delete mode 100644 source/blender/editors/include/BIF_toolbox.h delete mode 100644 source/blender/editors/include/BIF_transform.h delete mode 100644 source/blender/editors/include/BIF_usiblender.h delete mode 100644 source/blender/editors/include/BIF_verse.h delete mode 100644 source/blender/editors/include/BIF_writeavicodec.h delete mode 100644 source/blender/editors/include/BIF_writeimage.h delete mode 100644 source/blender/editors/include/BIF_writemovie.h delete mode 100644 source/blender/editors/include/BSE_drawimasel.h delete mode 100644 source/blender/editors/include/BSE_drawipo.h delete mode 100644 source/blender/editors/include/BSE_drawnla.h delete mode 100644 source/blender/editors/include/BSE_drawoops.h delete mode 100644 source/blender/editors/include/BSE_drawview.h delete mode 100644 source/blender/editors/include/BSE_edit.h delete mode 100644 source/blender/editors/include/BSE_editaction_types.h delete mode 100644 source/blender/editors/include/BSE_editipo.h delete mode 100644 source/blender/editors/include/BSE_editipo_types.h delete mode 100644 source/blender/editors/include/BSE_editnla_types.h delete mode 100644 source/blender/editors/include/BSE_filesel.h delete mode 100644 source/blender/editors/include/BSE_headerbuttons.h delete mode 100644 source/blender/editors/include/BSE_node.h delete mode 100644 source/blender/editors/include/BSE_seqaudio.h delete mode 100644 source/blender/editors/include/BSE_seqeffects.h delete mode 100644 source/blender/editors/include/BSE_seqscopes.h delete mode 100644 source/blender/editors/include/BSE_sequence.h delete mode 100644 source/blender/editors/include/BSE_time.h delete mode 100644 source/blender/editors/include/BSE_trans_types.h delete mode 100644 source/blender/editors/include/BSE_types.h delete mode 100644 source/blender/editors/include/BSE_view.h delete mode 100644 source/blender/editors/include/blendef.h (limited to 'source') diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h deleted file mode 100644 index d80d4ee5a17..00000000000 --- a/source/blender/blenkernel/BKE_bad_level_calls.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * blenlib/BKE_bad_level_calls.h (mar-2001 nzc) - * - * Stuff that definitely does not belong in the kernel! These will all - * have to be removed in order to restore sanity. - * - * $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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ -#ifndef BKE_BAD_LEVEL_CALLS_H -#define BKE_BAD_LEVEL_CALLS_H - -extern ListBase editNurb; - -#include "BIF_editmesh.h" -#include "BIF_editmesh.h" -#include "BIF_editfont.h" -#include "BIF_editarmature.h" -#include "BIF_toolbox.h" -#include "BIF_interface.h" -#include "BIF_screen.h" - -#include "BDR_editcurve.h" -#include "BDR_vpaint.h" - -#include "BSE_sequence.h" - -#endif - diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 69ff6876acd..90f22f96af7 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -41,6 +41,7 @@ struct AviCodecData; struct QuicktimeCodecData; /* sequence related defines */ + #define WHILE_SEQ(base) { \ int totseq_, seq_; Sequence **seqar; \ build_seqar( base, &seqar, &totseq_); \ diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 1eb7e232382..c3429ca12f4 100644 --- a/source/blender/blenkernel/intern/anim.c +++ b/source/blender/blenkernel/intern/anim.c @@ -68,8 +68,6 @@ #include "BKE_particle.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" - #ifdef HAVE_CONFIG_H #include #endif @@ -98,8 +96,8 @@ void calc_curvepath(Object *ob) if(ob==NULL || ob->type != OB_CURVE) return; cu= ob->data; - if(ob==G.obedit) nu= editNurb.first; - else nu= cu->nurb.first; + //XXX if(ob==G.obedit) nu= editNurb.first; + //XXX else nu= cu->nurb.first; if(cu->path) free_path(cu->path); cu->path= NULL; diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c index 6bdb663545c..78e8253625d 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -65,7 +65,7 @@ #include "BKE_object.h" #include "BKE_utildefines.h" -#include "BIF_editdeform.h" +//XXX #include "BIF_editdeform.h" #include "IK_solver.h" diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index c87c75b0190..66c8f1531d1 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -69,8 +69,6 @@ #include "BPY_extern.h" -#include "blendef.h" - #ifdef HAVE_CONFIG_H #include #endif diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index a963b877912..662ab1dc19c 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -78,7 +78,6 @@ #include "BKE_scene.h" #include "MEM_guardedalloc.h" -#include "blendef.h" #include "BPY_extern.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index a9b260536a2..2e686c46b0e 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -63,7 +63,6 @@ #include "BLI_editVert.h" #include "BLI_edgehash.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_global.h" #include "BKE_displist.h" @@ -1313,7 +1312,7 @@ void makeDispListSurf(Object *ob, ListBase *dispbase, int forRender) float (*deformedVerts)[3]; if(!forRender && ob==G.obedit) { - nubase= &editNurb; + //XXX nubase= &editNurb; } else { nubase= &cu->nurb; @@ -1396,7 +1395,7 @@ void makeDispListCurveTypes(Object *ob, int forOrco) float (*originalVerts)[3]; float (*deformedVerts)[3]; int obedit= (G.obedit && G.obedit->data==ob->data && G.obedit->type==OB_CURVE); - ListBase *nubase = obedit?&editNurb:&cu->nurb; + ListBase *nubase; //XXX ListBase *nubase = obedit?&editNurb:&cu->nurb; int numVerts; BLI_freelistN(&(cu->bev)); diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index a6946081730..f649dc9690f 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -93,7 +93,7 @@ #include #endif // DISABLE_ELBEEM -#include "BIF_screen.h" +//XXX #include "BIF_screen.h" /* temporal struct, used for reading return of mesh_get_mapped_verts_nors() */ @@ -1918,7 +1918,7 @@ void build_particle_system(Object *ob) if(waitcursor_set==0 && (a % 256)==255) { double seconds= PIL_check_seconds_timer(); if(seconds - startseconds > 0.5) { - waitcursor(1); + //XXX waitcursor(1); waitcursor_set= 1; } } diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 3b6aa3bc1eb..24c84a6d5ec 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -99,7 +99,6 @@ #include "DNA_view3d_types.h" #include "DNA_userdef_types.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BLI_blenlib.h" #include "BLI_arithb.h" @@ -122,8 +121,6 @@ #include "BPY_extern.h" -#include "blendef.h" - #include "zlib.h" static int is_dxf(char *str); @@ -178,7 +175,6 @@ static int is_stl(char *str) MEM_freeN(facedata); \ fclose(fpSTL); \ sprintf(error_msg, "Problems reading face %d!", i); \ - error(error_msg); \ return; \ } \ else { \ @@ -245,7 +241,7 @@ static void read_stl_mesh_binary(char *str) fpSTL= fopen(str, "rb"); if(fpSTL==NULL) { - error("Can't read file"); + //XXX error("Can't read file"); return; } @@ -306,7 +302,7 @@ static void read_stl_mesh_binary(char *str) mesh_add_normals_flags(me); make_edges(me, 0); } - waitcursor(1); + //XXX waitcursor(1); } fclose(fpSTL); @@ -318,7 +314,6 @@ static void read_stl_mesh_binary(char *str) fclose(fpSTL); \ sprintf(error_msg, "Can't allocate storage for %d faces!", \ numtenthousand * 10000); \ - error(error_msg); \ return; \ } @@ -327,7 +322,6 @@ static void read_stl_mesh_binary(char *str) fclose(fpSTL); \ free(vertdata); \ sprintf(error_msg, "Line %d: %s", linenum, message); \ - error(message); \ return; \ } @@ -363,7 +357,7 @@ static void read_stl_mesh_ascii(char *str) fpSTL= fopen(str, "r"); if(fpSTL==NULL) { - error("Can't read file"); + //XXX error("Can't read file"); return; } @@ -373,7 +367,7 @@ static void read_stl_mesh_ascii(char *str) */ numtenthousand = 1; vertdata = malloc(numtenthousand*3*30000*sizeof(float)); // uses realloc! - if (!vertdata) STLALLOCERROR; + if (!vertdata); STLALLOCERROR; linenum = 1; /* Get rid of the first line */ @@ -396,7 +390,7 @@ static void read_stl_mesh_ascii(char *str) ++numtenthousand; vertdata = realloc(vertdata, numtenthousand*3*30000*sizeof(float)); - if (!vertdata) STLALLOCERROR; + if (!vertdata); STLALLOCERROR; } /* Don't read normal, but check line for proper syntax anyway @@ -474,7 +468,7 @@ static void read_stl_mesh_ascii(char *str) mesh_add_normals_flags(me); make_edges(me, 0); - waitcursor(1); + //XXX waitcursor(1); } #undef STLALLOCERROR @@ -498,7 +492,7 @@ static void read_videoscape_mesh(char *str) fp= fopen(str, "rb"); if(fp==NULL) { - error("Can't read file"); + //XXX error("Can't read file"); return; } @@ -507,12 +501,12 @@ static void read_videoscape_mesh(char *str) fscanf(fp, "%d\n", &verts); if(verts<=0) { fclose(fp); - error("Read error"); + //XXX error("Read error"); return; } if(verts>MESH_MAX_VERTS) { - error("too many vertices"); + //XXX error("too many vertices"); fclose(fp); return; } @@ -686,7 +680,7 @@ static void read_videoscape_mesh(char *str) mesh_add_normals_flags(me); make_edges(me, 0); - waitcursor(1); + //XXX waitcursor(1); } static void read_radiogour(char *str) @@ -704,7 +698,7 @@ static void read_radiogour(char *str) fp= fopen(str, "rb"); if(fp==NULL) { - error("Can't read file"); + //XXX error("Can't read file"); return; } @@ -713,12 +707,12 @@ static void read_radiogour(char *str) fscanf(fp, "%d\n", &verts); if(verts<=0) { fclose(fp); - error("Read error"); + //XXX error("Read error"); return; } if(verts>MESH_MAX_VERTS) { - error("too many vertices"); + //XXX error("too many vertices"); fclose(fp); return; } @@ -754,7 +748,7 @@ static void read_radiogour(char *str) if(totedge+tottria+totquad>MESH_MAX_VERTS) { printf(" var1: %d, var2: %d, var3: %d \n", totedge, tottria, totquad); - error("too many faces"); + //XXX error("too many faces"); MEM_freeN(vertdata); MEM_freeN(colvertdata); fclose(fp); @@ -869,7 +863,7 @@ static void read_radiogour(char *str) mesh_add_normals_flags(me); make_edges(me, 0); - waitcursor(1); + //XXX waitcursor(1); } @@ -884,7 +878,7 @@ static void read_videoscape_lamp(char *str) fp= fopen(str, "rb"); if(fp==NULL) { - error("Can't read file"); + //XXX error("Can't read file"); return; } @@ -929,7 +923,7 @@ static void read_videoscape_nurbs(char *str) fp= fopen(str, "rb"); if(fp==NULL) { - error("Can't read file"); + //XXX error("Can't read file"); return; } @@ -1243,7 +1237,7 @@ static void read_inventor(char *str, struct ListBase *listb) file= open(str, O_BINARY|O_RDONLY); if(file== -1) { - error("Can't read file\n"); + //XXX error("Can't read file\n"); return; } @@ -2018,7 +2012,7 @@ static void displist_to_mesh(DispList *dlfirst) } if(totcol>16) { - error("Found more than 16 different colors"); + //XXX error("Found more than 16 different colors"); totcol= 16; } @@ -2291,7 +2285,7 @@ static void displist_to_objects(ListBase *lbase) if(totvert==0) { - if(ivsurf==0) error("Found no data"); + if(ivsurf==0) ; //XXX error("Found no data"); if(lbase->first) BLI_freelistN(lbase); return; @@ -2377,7 +2371,7 @@ int BKE_read_exotic(char *name) gzfile = gzopen(name,"rb"); if (NULL == gzfile ) { - error("Can't open file: %s", name); + //XXX error("Can't open file: %s", name); retval= -1; } else { gzread(gzfile, str, 31); @@ -2385,11 +2379,11 @@ int BKE_read_exotic(char *name) if ((*s0 != FORM) && (strncmp(str, "BLEN", 4) != 0) && !BLI_testextensie(name,".blend.gz")) { - waitcursor(1); + //XXX waitcursor(1); if(*s0==GOUR) { if(G.obedit) { - error("Unable to perform function in EditMode"); + //XXX error("Unable to perform function in EditMode"); } else { read_radiogour(name); retval = 1; @@ -2397,7 +2391,7 @@ int BKE_read_exotic(char *name) } else if ELEM4(*s0, DDG1, DDG2, DDG3, DDG4) { if(G.obedit) { - error("Unable to perform function in EditMode"); + //XXX error("Unable to perform function in EditMode"); } else { read_videoscape(name); retval = 1; @@ -2409,7 +2403,7 @@ int BKE_read_exotic(char *name) displist_to_objects(&lbase); retval = 1; } else { - error("Can only read Inventor 1.0 ascii"); + //XXX error("Can only read Inventor 1.0 ascii"); } } else if((strncmp(str, "#VRML V1.0 asc", 14)==0)) { @@ -2433,11 +2427,11 @@ int BKE_read_exotic(char *name) if (BPY_call_importloader(name)) { retval = 1; } else { - error("Unknown file type or error, check console"); + //XXX error("Unknown file type or error, check console"); } } - waitcursor(0); + //XXX waitcursor(0); } } } @@ -2521,19 +2515,19 @@ void write_stl(char *str) if (!during_script()) { if (BLI_exists(str)) - if(saveover(str)==0) - return; + ; //XXX if(saveover(str)==0) + //XXX return; } fpSTL= fopen(str, "wb"); if(fpSTL==NULL) { - if (!during_script()) error("Can't write file"); + if (!during_script()) ; //XXX error("Can't write file"); return; } strcpy(temp_dir, str); - waitcursor(1); + //XXX waitcursor(1); /* The header part of the STL */ /* First 80 characters are a title or whatever you want. @@ -2570,7 +2564,7 @@ void write_stl(char *str) fclose(fpSTL); - waitcursor(0); + //XXX waitcursor(0); } static void write_videoscape_mesh(Object *ob, char *str) @@ -2695,7 +2689,8 @@ void write_videoscape(char *str) file= open(str,O_BINARY|O_RDONLY); close(file); - if(file>-1) if(!during_script() && saveover(str)==0) return; + //XXX saveover() + // if(file>-1) if(!during_script() && saveover(str)==0) return; strcpy(temp_dir, str); @@ -3010,18 +3005,17 @@ void write_vrml(char *str) if(BLI_testextensie(str,".blend")) str[ strlen(str)-6]= 0; if(BLI_testextensie(str,".ble")) str[ strlen(str)-4]= 0; if(BLI_testextensie(str,".wrl")==0) strcat(str, ".wrl"); - - if(!during_script() && saveover(str)==0) return; + //XXX saveover() if(!during_script() && saveover(str)==0) return; fp= fopen(str, "w"); if(fp==NULL && !during_script()) { - error("Can't write file"); + //XXX error("Can't write file"); return; } strcpy(temp_dir, str); - waitcursor(1); + //XXX waitcursor(1); /* FIRST: write all the datablocks */ @@ -3089,7 +3083,7 @@ void write_vrml(char *str) fclose(fp); - waitcursor(0); + //XXX waitcursor(0); } @@ -3324,19 +3318,19 @@ void write_dxf(char *str) if (!during_script()) { if (BLI_exists(str)) - if(saveover(str)==0) - return; + ; //XXX if(saveover(str)==0) + // return; } fp= fopen(str, "w"); if(fp==NULL && !during_script()) { - error("Can't write file"); + //XXX error("Can't write file"); return; } strcpy(temp_dir, str); - waitcursor(1); + //XXX waitcursor(1); /* The header part of the DXF */ @@ -3389,7 +3383,7 @@ void write_dxf(char *str) write_group(0, "EOF"); fclose(fp); - waitcursor(0); + //XXX waitcursor(0); } @@ -3516,13 +3510,14 @@ static int read_groupf(char *str) return ret; } -#define id_test(id) if(id<0) {char errmsg[128];fclose(dxf_fp); if(id==-1) sprintf(errmsg, "Error inputting dxf, near line %d", dxf_line); else if(id==-2) sprintf(errmsg, "Error reading dxf, near line %d", dxf_line);error(errmsg); return;} +//XXX error() is now printf until we have a callback error +#define id_test(id) if(id<0) {char errmsg[128];fclose(dxf_fp); if(id==-1) sprintf(errmsg, "Error inputting dxf, near line %d", dxf_line); else if(id==-2) sprintf(errmsg, "Error reading dxf, near line %d", dxf_line);printf(errmsg); return;} #define read_group(id,str) {id= read_groupf(str); id_test(id);} #define group_is(idtst,str) (id==idtst&&strcmp(val,str)==0) #define group_isnt(idtst,str) (id!=idtst||strcmp(val,str)!=0) -#define id_check(idtst,str) if(group_isnt(idtst,str)) { fclose(dxf_fp); error("Error parsing dxf, near line %d", dxf_line); return;} +#define id_check(idtst,str) if(group_isnt(idtst,str)) { fclose(dxf_fp); printf("Error parsing dxf, near line %d", dxf_line); return;} static int id; static char val[256]; @@ -4335,7 +4330,7 @@ static void dxf_read_polyline(int noob) { } else if (vflags & 128) { if(vids[2]==0) { - error("(PL) Error parsing dxf, not enough vertices near line %d", dxf_line); + //XXX error("(PL) Error parsing dxf, not enough vertices near line %d", dxf_line); error_exit=1; fclose(dxf_fp); @@ -4367,7 +4362,7 @@ static void dxf_read_polyline(int noob) { mface->mat_nr= 0; } else { - error("Error parsing dxf, unknown polyline information near %d", dxf_line); + //XXX error("Error parsing dxf, unknown polyline information near %d", dxf_line); error_exit=1; fclose(dxf_fp); @@ -4447,14 +4442,14 @@ static void dxf_read_lwpolyline(int noob) { if (id == 10) { vert[0]= (float) atof(val); } else { - error("Error parsing dxf, expected (10, ) at line %d", dxf_line); + //XXX error("Error parsing dxf, expected (10, ) at line %d", dxf_line); } read_group(id,val); if (id == 20) { vert[1]= (float) atof(val); } else { - error("Error parsing dxf, expected (20, ) at line %d", dxf_line); + //XXX error("Error parsing dxf, expected (20, ) at line %d", dxf_line); } mvert = &me->mvert[v]; @@ -4590,7 +4585,7 @@ static void dxf_read_3dface(int noob) dxf_close_3dface(); if(nverts<3) { - error("(3DF) Error parsing dxf, not enough vertices near line %d", dxf_line); + //XXX error("(3DF) Error parsing dxf, not enough vertices near line %d", dxf_line); error_exit=1; fclose(dxf_fp); @@ -4703,7 +4698,7 @@ static void dxf_read(char *filename) } else if (id==3) { /* Now the object def should follow */ if(strlen(entname)==0) { - error("Error parsing dxf, no mesh name near %d", dxf_line); + //XXX error("Error parsing dxf, no mesh name near %d", dxf_line); fclose(dxf_fp); return; } @@ -4813,7 +4808,7 @@ static void dxf_read(char *filename) } if(strlen(obname)==0) { - error("Error parsing dxf, no object name near %d", dxf_line); + //XXX error("Error parsing dxf, no object name near %d", dxf_line); fclose(dxf_fp); return; } diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c index 2a2547fd839..7891dde3b3c 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -56,7 +56,6 @@ #include "DNA_scene_types.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" #include "BKE_packedFile.h" @@ -385,8 +384,6 @@ VFont *load_vfont(char *name) if (pf) { VFontData *vfd; - - waitcursor(1); #ifdef WITH_FREETYPE2 vfd= BLI_vfontdata_from_freetypefont(pf); @@ -420,7 +417,7 @@ VFont *load_vfont(char *name) freePackedFile(pf); } - waitcursor(0); + //XXX waitcursor(0); } return vfont; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 6b0586ab62c..a79433fcfa1 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -72,7 +72,7 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "BIF_editseq.h" +//XXX #include "BIF_editseq.h" #include "PIL_time.h" @@ -81,8 +81,6 @@ /* for stamp drawing to an image */ #include "BMF_Api.h" -#include "BDR_drawmesh.h" - /* max int, to indicate we don't store sequences in ibuf */ #define IMA_NO_INDEX 0x7FEFEFEF @@ -217,7 +215,7 @@ static void image_free_buffers(Image *ima) ima->rr= NULL; } - free_realtime_image(ima); + //XXX free_realtime_image(ima); ima->ok= IMA_OK; } @@ -553,7 +551,7 @@ void free_old_images() This gives textures a "second chance" to be used before dying. */ if(ima->bindcode || ima->repbind) { - free_realtime_image(ima); + //XXX free_realtime_image(ima); ima->lastused = ctime; } /* Otherwise, just kill the buffers */ @@ -893,7 +891,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_SEQSTRIP) { - Sequence *seq = get_forground_frame_seq(G.scene->r.cfra); + Sequence *seq; //XXX = get_forground_frame_seq(G.scene->r.cfra); if (seq) strcpy(text, seq->name+2); else strcpy(text, ""); diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 4af310913d6..2b68d26994f 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -63,7 +63,6 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_action.h" @@ -2140,7 +2139,7 @@ void do_ob_ipo(Object *ob) if(ob->id.name[2]=='S' && ob->id.name[3]=='C' && ob->id.name[4]=='E') { if(strcmp(G.scene->id.name+2, ob->id.name+6)==0) { G.scene->lay= ob->lay; - copy_view3d_lock(0); + //XXX copy_view3d_lock(0); /* no redraw here! creates too many calls */ } } diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c index b57b799001a..4a62c64f48a 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -48,7 +48,6 @@ #include "DNA_scene_types.h" #include "BKE_action.h" -#include "BKE_bad_level_calls.h" #include "BKE_blender.h" #include "BKE_curve.h" #include "BKE_global.h" @@ -63,8 +62,6 @@ #include "BLI_blenlib.h" -#include "blendef.h" - #ifdef HAVE_CONFIG_H #include #endif diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 2b815c28cc5..8f98b96d0f4 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -73,14 +73,12 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "BIF_editdeform.h" +//XXX #include "BIF_editdeform.h" #ifdef HAVE_CONFIG_H #include #endif -#include "blendef.h" - Lattice *editLatt=0; static Lattice *deformLatt=0; diff --git a/source/blender/blenkernel/intern/library.c b/source/blender/blenkernel/intern/library.c index 54575aeae7d..5976f7846f2 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -84,7 +84,6 @@ #include "BLI_blenlib.h" #include "BLI_dynstr.h" -#include "BKE_bad_level_calls.h" #include "BKE_library.h" #include "BKE_main.h" #include "BKE_global.h" diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 42cac46c241..2b94ea0b09c 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -50,7 +50,6 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BKE_bad_level_calls.h" #include "BKE_blender.h" #include "BKE_displist.h" #include "BKE_global.h" @@ -842,7 +841,7 @@ void delete_material_index() int a, actcol; if(G.obedit) { - error("Unable to perform function in EditMode"); + //XXX error("Unable to perform function in EditMode"); return; } ob= ((G.scene->basact)? (G.scene->basact->object) : 0) ; diff --git a/source/blender/blenkernel/intern/mball.c b/source/blender/blenkernel/intern/mball.c index 420fea0a66d..3933e2bfaa0 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -53,7 +53,6 @@ #include "BLI_arithb.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" #include "BKE_global.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 25a391be566..32e4d5cc1b0 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -72,7 +72,6 @@ /* -- */ #include "BKE_object.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" #ifdef WITH_VERSE #include "BKE_verse.h" diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index d609b231905..811b6d39f47 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -73,7 +73,6 @@ #include "BKE_main.h" #include "BKE_anim.h" -#include "BKE_bad_level_calls.h" #include "BKE_curve.h" #include "BKE_customdata.h" #include "BKE_global.h" @@ -101,7 +100,7 @@ #include "RE_shader_ext.h" -#include "BIF_meshlaplacian.h" +//XXX #include "BIF_meshlaplacian.h" /***/ diff --git a/source/blender/blenkernel/intern/multires-firstlevel.c b/source/blender/blenkernel/intern/multires-firstlevel.c index a276266d34f..b27d1c4b156 100644 --- a/source/blender/blenkernel/intern/multires-firstlevel.c +++ b/source/blender/blenkernel/intern/multires-firstlevel.c @@ -38,7 +38,7 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BIF_editmesh.h" +//XXX #include "BIF_editmesh.h" #include "BKE_customdata.h" #include "BKE_global.h" @@ -49,8 +49,6 @@ #include "MEM_guardedalloc.h" -#include "blendef.h" - #include MDeformVert *subdivide_dverts(MDeformVert *src, MultiresLevel *lvl); @@ -388,7 +386,7 @@ void multires_delete_layer(Mesh *me, CustomData *cd, const int type, int n) CustomData_set_layer_active(cd, type, n); CustomData_free_layer_active(cd, type, lvl1->totface); - multires_level_to_mesh(OBACT, me, 0); + multires_level_to_mesh((G.scene->basact)->object, me, 0); } } @@ -404,6 +402,6 @@ void multires_add_layer(Mesh *me, CustomData *cd, const int type, const int n) CustomData_add_layer(cd, type, CD_DEFAULT, NULL, current_level(me->mr)->totface); CustomData_set_layer_active(cd, type, n); - multires_level_to_mesh(OBACT, me, 0); + multires_level_to_mesh((G.scene->basact)->object, me, 0); } } diff --git a/source/blender/blenkernel/intern/multires.c b/source/blender/blenkernel/intern/multires.c index 0874890a2c6..b57a5f465c0 100644 --- a/source/blender/blenkernel/intern/multires.c +++ b/source/blender/blenkernel/intern/multires.c @@ -35,8 +35,6 @@ #include "DNA_object_types.h" #include "DNA_vec_types.h" -#include "BIF_editmesh.h" - #include "BLI_arithb.h" #include "BLI_blenlib.h" #include "BLI_editVert.h" @@ -46,7 +44,6 @@ #include "BKE_global.h" #include "BKE_multires.h" -#include "blendef.h" #include "editmesh.h" #include @@ -188,7 +185,7 @@ void eed_to_medge_flag(EditEdge *eed, short *flag, char *crease) if(eed->f2==0) *flag |= ME_LOOSEEDGE; if(eed->sharp) *flag |= ME_SHARP; if(eed->seam) *flag |= ME_SEAM; - if(eed->h & EM_FGON) *flag |= ME_FGON; + //XXX if(eed->h & EM_FGON) *flag |= ME_FGON; if(eed->h & 1) *flag |= ME_HIDE; *crease= (char)(255.0*eed->crease); @@ -218,7 +215,7 @@ static void multires_get_face(MultiresFace *f, EditFace *efa, MFace *m) tmp.v3= efa->v3->tmp.l; tmp.v4= 0; if(efa->v4) tmp.v4= efa->v4->tmp.l; - test_index_face(&tmp, NULL, 0, efa->v4?4:3); + //XXX test_index_face(&tmp, NULL, 0, efa->v4?4:3); for(j=0; j<4; ++j) f->v[j]= (&tmp.v1)[j]; /* Flags */ @@ -357,7 +354,7 @@ void multires_create(Object *ob, Mesh *me) lvl= MEM_callocN(sizeof(MultiresLevel), "multires level"); - if(me->pv) mesh_pmv_off(ob, me); + //XXX if(me->pv) mesh_pmv_off(ob, me); me->mr= MEM_callocN(sizeof(Multires), "multires data"); @@ -1033,7 +1030,7 @@ void multires_level_to_mesh(Object *ob, Mesh *me, const int render) CustomData_add_layer(&me->vdata, CD_MVERT, CD_CALLOC, NULL, me->totvert); CustomData_add_layer(&me->edata, CD_MEDGE, CD_CALLOC, NULL, me->totedge); CustomData_add_layer(&me->fdata, CD_MFACE, CD_CALLOC, NULL, me->totface); - mesh_update_customdata_pointers(me); + //XXX mesh_update_customdata_pointers(me); /* Vertices/Edges/Faces */ @@ -1088,11 +1085,11 @@ void multires_level_to_mesh(Object *ob, Mesh *me, const int render) } - mesh_update_customdata_pointers(me); + //XXX mesh_update_customdata_pointers(me); multires_edge_level_update(ob,me); DAG_object_flush_update(G.scene, ob, OB_RECALC_DATA); - mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL); + //XXX mesh_calc_normals(me->mvert, me->totvert, me->mface, me->totface, NULL); } void multires_add_level(Object *ob, Mesh *me, const char subdiv_type) @@ -1103,7 +1100,7 @@ void multires_add_level(Object *ob, Mesh *me, const char subdiv_type) MVert *oldverts= NULL; lvl= MEM_callocN(sizeof(MultiresLevel), "multireslevel"); - if(me->pv) mesh_pmv_off(ob, me); + //XXX if(me->pv) mesh_pmv_off(ob, me); check_colors(me); multires_update_levels(me, 0); @@ -1269,7 +1266,7 @@ void multires_add_level(Object *ob, Mesh *me, const char subdiv_type) void multires_set_level(Object *ob, Mesh *me, const int render) { - if(me->pv) mesh_pmv_off(ob, me); + //XXX if(me->pv) mesh_pmv_off(ob, me); check_colors(me); multires_update_levels(me, render); diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index d48be54fe10..e6750c02c2e 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -81,7 +81,6 @@ #include "BLI_editVert.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" #include "BKE_main.h" #include "BKE_global.h" @@ -1583,7 +1582,7 @@ static void give_parvert(Object *par, int nr, float *vec) cu= par->data; nu= cu->nurb.first; - if(par==G.obedit) nu= editNurb.first; + //XXX if(par==G.obedit) nu= editNurb.first; count= 0; while(nu) { diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index bd33fafe23c..a00828ed568 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -64,7 +64,6 @@ #include "BKE_image.h" #include "BKE_font.h" #include "BKE_packedFile.h" -#include "BKE_bad_level_calls.h" /* <- waitcursor */ int seekPackedFile(PackedFile * pf, int offset, int whence) { @@ -183,7 +182,7 @@ PackedFile * newPackedFile(char * filename) char name[FILE_MAXDIR+FILE_MAXFILE]; void * data; - waitcursor(1); + //XXX waitcursor(1); // convert relative filenames to absolute filenames @@ -213,7 +212,7 @@ PackedFile * newPackedFile(char * filename) close(file); } - waitcursor(0); + //XXX waitcursor(0); return (pf); } @@ -286,7 +285,7 @@ int writePackedFile(char * filename, PackedFile *pf, int guimode) char tempname[FILE_MAXDIR + FILE_MAXFILE]; /* void * data; */ - if (guimode) waitcursor(1); + if (guimode); //XXX waitcursor(1); strcpy(name, filename); BLI_convertstringcode(name, G.sce, G.scene->r.cfra); @@ -309,28 +308,28 @@ int writePackedFile(char * filename, PackedFile *pf, int guimode) file = open(name, O_BINARY + O_WRONLY + O_CREAT + O_TRUNC, 0666); if (file >= 0) { if (write(file, pf->data, pf->size) != pf->size) { - if(guimode) error("Error writing file: %s", name); + if(guimode) ; //XXX error("Error writing file: %s", name); ret_value = RET_ERROR; } close(file); } else { - if(guimode) error("Error creating file: %s", name); + if(guimode); //XXX error("Error creating file: %s", name); ret_value = RET_ERROR; } if (remove_tmp) { if (ret_value == RET_ERROR) { if (BLI_rename(tempname, name) == RET_ERROR) { - if(guimode) error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name); + if(guimode); //XXX error("Error restoring tempfile. Check files: '%s' '%s'", tempname, name); } } else { if (BLI_delete(tempname, 0, 0) == RET_ERROR) { - if(guimode) error("Error deleting '%s' (ignored)"); + if(guimode); //XXX error("Error deleting '%s' (ignored)"); } } } - if(guimode) waitcursor(0); + if(guimode); //XXX waitcursor(0); return (ret_value); } @@ -453,7 +452,7 @@ char *unpackFile(char * abs_name, char * local_name, PackedFile * pf, int how) break; } - how = pupmenu(menu); + //XXX how = pupmenu(menu); } switch (how) { diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index f6b4ba48b26..c77fcc7c0e8 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -74,13 +74,10 @@ #include "BKE_key.h" #include "BKE_library.h" #include "BKE_depsgraph.h" -#include "BKE_bad_level_calls.h" #include "BKE_modifier.h" #include "BKE_mesh.h" #include "BKE_cdderivedmesh.h" -#include "blendef.h" -#include "BIF_editparticle.h" #include "RE_render_ext.h" static void key_from_object(Object *ob, ParticleKey *key); @@ -248,7 +245,7 @@ int psys_ob_has_hair(Object *ob) } int psys_in_edit_mode(ParticleSystem *psys) { - return ((G.f & G_PARTICLEEDIT) && psys==psys_get_current(OBACT) && psys->edit); + return ((G.f & G_PARTICLEEDIT) && psys==psys_get_current((G.scene->basact)->object) && psys->edit); } int psys_check_enabled(Object *ob, ParticleSystem *psys) { @@ -332,7 +329,7 @@ void psys_free(Object *ob, ParticleSystem * psys) free_keyed_keys(psys); - PE_free_particle_edit(psys); + //XXX PE_free_particle_edit(psys); if(psys->particles){ MEM_freeN(psys->particles); @@ -2245,7 +2242,7 @@ void psys_cache_paths(Object *ob, ParticleSystem *psys, float cfra, int editupda //timed = edit->draw_timed; - PE_get_colors(sel,nosel); + //XXX PE_get_colors(sel,nosel); if(pset->brushtype == PE_BRUSH_WEIGHT){ sel_col[0] = sel_col[1] = sel_col[2] = 1.0f; nosel_col[0] = nosel_col[1] = nosel_col[2] = 0.0f; diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 81203ad7176..5b56216f08e 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4252,7 +4252,7 @@ static void hair_step(Object *ob, ParticleSystemModifierData *psmd, ParticleSyst precalc_effectors(ob,psys,psmd); if(psys_in_edit_mode(psys)) - PE_recalc_world_cos(ob, psys); + ; //XXX PE_recalc_world_cos(ob, psys); psys_update_path_cache(ob,psmd,psys,cfra); } diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 2afcf19427c..206c1f8fc15 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -42,7 +42,6 @@ #include "BLI_blenlib.h" #include "BKE_utildefines.h" -#include "blendef.h" /* needed for directory lookup */ #ifndef WIN32 diff --git a/source/blender/blenkernel/intern/property.c b/source/blender/blenkernel/intern/property.c index a60c03c4840..30b9cf91624 100644 --- a/source/blender/blenkernel/intern/property.c +++ b/source/blender/blenkernel/intern/property.c @@ -47,9 +47,7 @@ #include "DNA_object_types.h" #include "DNA_listBase.h" - #include "BLI_blenlib.h" -#include "BKE_bad_level_calls.h" #include "BKE_property.h" void free_property(bProperty *prop) diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index 6f372bfb45d..fce43aba6bc 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -47,7 +47,6 @@ #include "DNA_object_types.h" #include "BLI_blenlib.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_global.h" #include "BKE_main.h" diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 47640ad07ae..b19e2f4f0be 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -63,7 +63,6 @@ #include "BKE_action.h" #include "BKE_anim.h" #include "BKE_armature.h" -#include "BKE_bad_level_calls.h" #include "BKE_colortools.h" #include "BKE_constraint.h" #include "BKE_depsgraph.h" @@ -81,7 +80,7 @@ #include "BKE_world.h" #include "BKE_utildefines.h" -#include "BIF_previewrender.h" +//XXX #include "BIF_previewrender.h" #include "BPY_extern.h" #include "BLI_arithb.h" @@ -136,7 +135,7 @@ void free_scene(Scene *sce) /* do not free objects! */ BLI_freelistN(&sce->base); - free_editing(sce->ed); + //XXX free_editing(sce->ed); if(sce->radio) MEM_freeN(sce->radio); sce->radio= 0; @@ -349,7 +348,7 @@ void set_scene_name(char *name) } } - error("Can't find scene: %s", name); + //XXX error("Can't find scene: %s", name); } /* used by metaballs diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c index c2035a19384..b41fdbba5e4 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -34,7 +34,6 @@ #include #include "DNA_screen_types.h" -#include "BKE_bad_level_calls.h" #include "BLI_blenlib.h" #include "BKE_screen.h" @@ -46,7 +45,7 @@ /* don't free screen itself */ void free_screen(bScreen *sc) { - unlink_screen(sc); /* bad level call */ + //XXX unlink_screen(sc); /* bad level call */ BLI_freelistN(&sc->vertbase); BLI_freelistN(&sc->edgebase); diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index bd9d1cb75ca..224da56a047 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -84,8 +84,8 @@ variables on the UI for now #include "BKE_pointcache.h" #include "BKE_modifier.h" -#include "BIF_editdeform.h" -#include "BIF_graphics.h" +//XXX #include "BIF_editdeform.h" +//XXX #include "BIF_graphics.h" #include "PIL_time.h" /* callbacks for errors and interrupts and some goo */ diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 0b1563beced..9f9d3be93c2 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -43,7 +43,6 @@ #include "DNA_modifier_types.h" #include "DNA_object_types.h" -#include "BKE_bad_level_calls.h" #include "BKE_cdderivedmesh.h" #include "BKE_customdata.h" #include "BKE_utildefines.h" @@ -877,8 +876,8 @@ static void ss_sync_from_derivedmesh(CCGSubSurf *ss, DerivedMesh *dm, static int hasGivenError = 0; if(!hasGivenError) { - error("Unrecoverable error in SubSurf calculation," - " mesh is inconsistent."); + //XXX error("Unrecoverable error in SubSurf calculation," + // " mesh is inconsistent."); hasGivenError = 1; } diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index ea0dabe1e81..c71fb18c1ab 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -41,7 +41,6 @@ #include "DNA_scene_types.h" #include "DNA_text_types.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_text.h" #include "BKE_library.h" @@ -1422,7 +1421,7 @@ void txt_print_undo(Text *text) static void txt_undo_add_op(Text *text, int op) { - MAX_UNDO_TEST(2); + //XXX MAX_UNDO_TEST(2); text->undo_pos++; text->undo_buf[text->undo_pos]= op; @@ -1435,7 +1434,7 @@ static void txt_undo_add_block(Text *text, int op, char *buf) length= strlen(buf); - MAX_UNDO_TEST(length+11); + //XXX MAX_UNDO_TEST(length+11); text->undo_pos++; text->undo_buf[text->undo_pos]= op; @@ -1469,7 +1468,7 @@ static void txt_undo_add_block(Text *text, int op, char *buf) void txt_undo_add_toop(Text *text, int op, unsigned int froml, unsigned short fromc, unsigned int tol, unsigned short toc) { - MAX_UNDO_TEST(15); + //XXX MAX_UNDO_TEST(15); if (froml==tol && fromc==toc) return; @@ -1512,7 +1511,7 @@ void txt_undo_add_toop(Text *text, int op, unsigned int froml, unsigned short fr static void txt_undo_add_charop(Text *text, int op, char c) { - MAX_UNDO_TEST(4); + //XXX MAX_UNDO_TEST(4); text->undo_pos++; text->undo_buf[text->undo_pos]= op; @@ -1734,7 +1733,7 @@ void txt_do_undo(Text *text) text->undo_pos--; break; default: - error("Undo buffer error - resetting"); + //XXX error("Undo buffer error - resetting"); text->undo_pos= -1; break; @@ -1934,7 +1933,7 @@ void txt_do_redo(Text *text) } break; default: - error("Undo buffer error - resetting"); + //XXX error("Undo buffer error - resetting"); text->undo_pos= -1; break; diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index e3b42a59784..9f227f177db 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -61,7 +61,6 @@ #include "BKE_plugin_types.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_global.h" @@ -175,8 +174,8 @@ PluginTex *add_plugin_tex(char *str) open_plugin_tex(pit); if(pit->doit==0) { - if(pit->handle==0) error("no plugin: %s", str); - else error("in plugin: %s", str); + if(pit->handle==0); //XXX error("no plugin: %s", str); + else ; //XXX error("in plugin: %s", str); MEM_freeN(pit); return NULL; } diff --git a/source/blender/blenkernel/intern/verse_method.c b/source/blender/blenkernel/intern/verse_method.c index 2b307c86197..42e0d45768e 100644 --- a/source/blender/blenkernel/intern/verse_method.c +++ b/source/blender/blenkernel/intern/verse_method.c @@ -41,7 +41,6 @@ #include "BIF_verse.h" -#include "BKE_bad_level_calls.h" #include "BKE_library.h" #include "BKE_text.h" #include "BKE_verse.h" diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 625ca57dbf3..9e926738470 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -48,7 +48,6 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_library.h" diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index cbaf1f8c605..a703d5c23ea 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -50,7 +50,6 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BKE_bad_level_calls.h" #include "BKE_global.h" #include "IMB_imbuf_types.h" @@ -59,7 +58,6 @@ #include "BSE_seqaudio.h" #include "DNA_scene_types.h" -#include "blendef.h" #ifdef HAVE_CONFIG_H #include diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index d67d16fdba8..c48bea70dc9 100644 --- a/source/blender/blenkernel/intern/writeframeserver.c +++ b/source/blender/blenkernel/intern/writeframeserver.c @@ -47,14 +47,12 @@ #include "BLI_blenlib.h" #include "DNA_userdef_types.h" -/*#include "BKE_bad_level_calls.h"*/ #include "BKE_global.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" #include "DNA_scene_types.h" -#include "blendef.h" #ifdef HAVE_CONFIG_H #include @@ -110,14 +108,14 @@ void start_frameserver(RenderData *rd, int rectx, int recty) if (!startup_socket_system()) { G.afbreek = 1; - error("Can't startup socket system"); + //XXX error("Can't startup socket system"); return; } if ((sock = socket(AF_INET, SOCK_STREAM, 0)) < 0) { shutdown_socket_system(); G.afbreek = 1; /* Abort render */ - error("Can't open socket"); + //XXX error("Can't open socket"); return; } @@ -131,14 +129,14 @@ void start_frameserver(RenderData *rd, int rectx, int recty) if (bind(sock, (struct sockaddr *)&addr, sizeof(addr)) < 0) { shutdown_socket_system(); G.afbreek = 1; /* Abort render */ - error("Can't bind to socket"); + //XXX error("Can't bind to socket"); return; } if (listen(sock, SOMAXCONN) < 0) { shutdown_socket_system(); G.afbreek = 1; /* Abort render */ - error("Can't establish listen backlog"); + //XXX error("Can't establish listen backlog"); return; } connsock = -1; diff --git a/source/blender/blenlib/BLI_storage_types.h b/source/blender/blenlib/BLI_storage_types.h index ebce33852a1..ea9ba607165 100644 --- a/source/blender/blenlib/BLI_storage_types.h +++ b/source/blender/blenlib/BLI_storage_types.h @@ -73,6 +73,18 @@ struct direntry{ struct ImBuf *image; }; +#define SELECT 1 +#define HIDDEN 1 +#define FIRST 1 +#define ACTIVE 2 +/*#ifdef WITH_VERSE*/ +#define VERSE 3 +/*#endif*/ +#define DESELECT 0 +#define NOT_YET 0 +#define VISIBLE 0 +#define LAST 0 + struct dirlink { struct dirlink *next,*prev; diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c index 2c1ebd59a55..e293c741607 100644 --- a/source/blender/blenlib/intern/bpath.c +++ b/source/blender/blenlib/intern/bpath.c @@ -42,7 +42,6 @@ #include "BKE_main.h" /* so we can access G.main->*.first */ #include "BKE_image.h" /* so we can check the image's type */ -#include "blendef.h" #include "BKE_utildefines.h" /* for writing to a textblock */ diff --git a/source/blender/blenlib/intern/freetypefont.c b/source/blender/blenlib/intern/freetypefont.c index 2e6aca3989b..0e5c63392ba 100644 --- a/source/blender/blenlib/intern/freetypefont.c +++ b/source/blender/blenlib/intern/freetypefont.c @@ -52,7 +52,7 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BIF_toolbox.h" +//XXX #include "BIF_toolbox.h" #include "BKE_global.h" #include "BKE_font.h" @@ -430,7 +430,7 @@ static int check_freetypefont(PackedFile * pf) &face ); if(err) { success = 0; - error("This is not a valid font"); + //XXX error("This is not a valid font"); } else { /* @@ -459,7 +459,7 @@ static int check_freetypefont(PackedFile * pf) if (glyph->format == ft_glyph_format_outline ) { success = 1; } else { - error("Selected Font has no outline data"); + //XXX error("Selected Font has no outline data"); success = 0; } } diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c index 508756141df..1ad59c7a369 100644 --- a/source/blender/blenloader/intern/readfile.c +++ b/source/blender/blenloader/intern/readfile.c @@ -107,8 +107,6 @@ #include "BLI_arithb.h" #include "BLI_storage_types.h" // for relname flags -#include "BDR_sculptmode.h" - #include "BKE_action.h" #include "BKE_armature.h" #include "BKE_colortools.h" @@ -138,9 +136,9 @@ #include "BKE_utildefines.h" // SWITCH_INT DATA ENDB DNA1 O_BINARY GLOB USER TEST REND #include "BKE_idprop.h" -#include "BIF_butspace.h" // badlevel, for do_versions, patching event codes -#include "BIF_filelist.h" // badlevel too, where to move this? - elubie -#include "BIF_previewrender.h" // bedlelvel, for struct RenderInfo +//XXX #include "BIF_butspace.h" // badlevel, for do_versions, patching event codes +//XXX #include "BIF_filelist.h" // badlevel too, where to move this? - elubie +//XXX #include "BIF_previewrender.h" // bedlelvel, for struct RenderInfo #include "BLO_readfile.h" #include "BLO_undofile.h" #include "BLO_readblenfile.h" // streaming read pipe, for BLO_readblenfile BLO_readblenfilememory @@ -152,7 +150,6 @@ #include "genfile.h" #include "mydevice.h" -#include "blendef.h" #include @@ -2921,7 +2918,7 @@ static void lib_link_object(FileData *fd, Main *main) ob= ob->id.next; } - if(warn) error("WARNING IN CONSOLE"); + if(warn); //XXX error("WARNING IN CONSOLE"); } @@ -3252,7 +3249,7 @@ static void lib_link_scene(FileData *fd, Main *main) ed= sce->ed; if(ed) { - WHILE_SEQ(&ed->seqbase) { + WHILE_SEQ(&ed->seqbase) { //XXX todo replace WHILE_SEQ if(seq->ipo) seq->ipo= newlibadr_us(fd, sce->id.lib, seq->ipo); if(seq->scene) seq->scene= newlibadr(fd, sce->id.lib, seq->scene); if(seq->sound) { @@ -3326,7 +3323,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) if(sce->sculptdata.cumap) direct_link_curvemapping(fd, sce->sculptdata.cumap); else - sculpt_reset_curve(&sce->sculptdata); + ; //XXX sculpt_reset_curve(&sce->sculptdata); if(sce->ed) { ListBase *old_seqbasep= &((Editing *)sce->ed)->seqbase; @@ -3336,7 +3333,7 @@ static void direct_link_scene(FileData *fd, Scene *sce) /* recursive link sequences, lb will be correctly initialized */ link_recurs_seq(fd, &ed->seqbase); - WHILE_SEQ(&ed->seqbase) { + WHILE_SEQ(&ed->seqbase) { //XXX todo replace WHILE_SEQ seq->seq1= newdataadr(fd, seq->seq1); seq->seq2= newdataadr(fd, seq->seq2); seq->seq3= newdataadr(fd, seq->seq3); @@ -3450,7 +3447,7 @@ static Sequence * find_sequence_from_ipo_helper(Main * main, Ipo * ipo) ed= sce->ed; - WHILE_SEQ(&ed->seqbase) { + WHILE_SEQ(&ed->seqbase) { //XXX todo replace WHILE_SEQ if (seq->ipo == ipo) { found = 1; break; @@ -3760,7 +3757,7 @@ void lib_link_screen_restore(Main *newmain, Scene *curscene) else if(sl->spacetype==SPACE_BUTS) { SpaceButs *sbuts= (SpaceButs *)sl; sbuts->lockpoin= NULL; - if (sbuts->ri) sbuts->ri->curtile = 0; + //XXX if (sbuts->ri) sbuts->ri->curtile = 0; } else if(sl->spacetype==SPACE_FILE) { SpaceFile *sfile= (SpaceFile *)sl; @@ -3771,7 +3768,7 @@ void lib_link_screen_restore(Main *newmain, Scene *curscene) else if(sl->spacetype==SPACE_IMASEL) { SpaceImaSel *simasel= (SpaceImaSel *)sl; if (simasel->files) { - BIF_filelist_freelib(simasel->files); + //XXX BIF_filelist_freelib(simasel->files); } } else if(sl->spacetype==SPACE_ACTION) { @@ -3978,7 +3975,7 @@ static void direct_link_library(FileData *fd, Library *lib, Main *main) BLI_remlink(&main->library, lib); MEM_freeN(lib); - error("Library had multiple instances, save and reload!"); + //XXX error("Library had multiple instances, save and reload!"); return; } } @@ -4894,7 +4891,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) while(sl) { if(sl->spacetype==SPACE_BUTS) { SpaceButs *sbuts= (SpaceButs*) sl; - sbuts->scaflag= BUTS_SENS_LINK|BUTS_SENS_ACT|BUTS_CONT_ACT|BUTS_ACT_ACT|BUTS_ACT_LINK; + //XXX sbuts->scaflag= BUTS_SENS_LINK|BUTS_SENS_ACT|BUTS_CONT_ACT|BUTS_ACT_ACT|BUTS_ACT_LINK; } sl= sl->next; } @@ -5542,52 +5539,52 @@ static void do_versions(FileData *fd, Library *lib, Main *main) if (sl->spacetype==SPACE_BUTS) { SpaceButs *sbuts= (SpaceButs *) sl; - sbuts->v2d.maxzoom= 1.2f; - sbuts->align= 1; /* horizontal default */ - - if(sbuts->mainb==BUTS_LAMP) { - sbuts->mainb= CONTEXT_SHADING; - sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_LAMP; - } - else if(sbuts->mainb==BUTS_MAT) { - sbuts->mainb= CONTEXT_SHADING; - sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_MAT; - } - else if(sbuts->mainb==BUTS_TEX) { - sbuts->mainb= CONTEXT_SHADING; - sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_TEX; - } - else if(sbuts->mainb==BUTS_ANIM) { - sbuts->mainb= CONTEXT_OBJECT; - } - else if(sbuts->mainb==BUTS_WORLD) { - sbuts->mainb= CONTEXT_SCENE; - sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_WORLD; - } - else if(sbuts->mainb==BUTS_RENDER) { - sbuts->mainb= CONTEXT_SCENE; - sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_RENDER; - } - else if(sbuts->mainb==BUTS_GAME) { - sbuts->mainb= CONTEXT_LOGIC; - } - else if(sbuts->mainb==BUTS_FPAINT) { - sbuts->mainb= CONTEXT_EDITING; - } - else if(sbuts->mainb==BUTS_RADIO) { - sbuts->mainb= CONTEXT_SHADING; - sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_RAD; - } - else if(sbuts->mainb==BUTS_CONSTRAINT) { - sbuts->mainb= CONTEXT_OBJECT; - } - else if(sbuts->mainb==BUTS_SCRIPT) { - sbuts->mainb= CONTEXT_OBJECT; - } - else if(sbuts->mainb==BUTS_EDIT) { - sbuts->mainb= CONTEXT_EDITING; - } - else sbuts->mainb= CONTEXT_SCENE; +//XXX sbuts->v2d.maxzoom= 1.2f; +//XXX sbuts->align= 1; /* horizontal default */ +//XXX +//XXX if(sbuts->mainb==BUTS_LAMP) { +//XXX sbuts->mainb= CONTEXT_SHADING; +//XXX sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_LAMP; +//XXX } +//XXX else if(sbuts->mainb==BUTS_MAT) { +//XXX sbuts->mainb= CONTEXT_SHADING; +//XXX sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_MAT; +//XXX } +//XXX else if(sbuts->mainb==BUTS_TEX) { +//XXX sbuts->mainb= CONTEXT_SHADING; +//XXX sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_TEX; +//XXX } +//XXX else if(sbuts->mainb==BUTS_ANIM) { +//XXX sbuts->mainb= CONTEXT_OBJECT; +//XXX } +//XXX else if(sbuts->mainb==BUTS_WORLD) { +//XXX sbuts->mainb= CONTEXT_SCENE; +//XXX sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_WORLD; +//XXX } +//XXX else if(sbuts->mainb==BUTS_RENDER) { +//XXX sbuts->mainb= CONTEXT_SCENE; +//XXX sbuts->tab[CONTEXT_SCENE]= TAB_SCENE_RENDER; +//XXX } +//XXX else if(sbuts->mainb==BUTS_GAME) { +//XXX sbuts->mainb= CONTEXT_LOGIC; +//XXX } +//XXX else if(sbuts->mainb==BUTS_FPAINT) { +//XXX sbuts->mainb= CONTEXT_EDITING; +//XXX } +//XXX else if(sbuts->mainb==BUTS_RADIO) { +//XXX sbuts->mainb= CONTEXT_SHADING; +//XXX sbuts->tab[CONTEXT_SHADING]= TAB_SHADING_RAD; +//XXX } +//XXX else if(sbuts->mainb==BUTS_CONSTRAINT) { +//XXX sbuts->mainb= CONTEXT_OBJECT; +//XXX } +//XXX else if(sbuts->mainb==BUTS_SCRIPT) { +//XXX sbuts->mainb= CONTEXT_OBJECT; +//XXX } +//XXX else if(sbuts->mainb==BUTS_EDIT) { +//XXX sbuts->mainb= CONTEXT_EDITING; +//XXX } +//XXX else sbuts->mainb= CONTEXT_SCENE; } } } @@ -5857,7 +5854,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main) while(sce) { ed= sce->ed; if(ed) { - WHILE_SEQ(&ed->seqbase) { + WHILE_SEQ(&ed->seqbase) { //XXX todo replace WHILE_SEQ if(seq->type==SEQ_IMAGE || seq->type==SEQ_MOVIE) seq->flag |= SEQ_MAKE_PREMUL; } END_SEQ @@ -8377,12 +8374,12 @@ void BLO_library_append_(BlendHandle** libfiledata, struct direntry* filelist, i if( strcmp(filelist[a].relname, file)==0) break; } if(a==totfile) { - error("Wrong indicated name"); + //XXX error("Wrong indicated name"); return; } } else { - error("Nothing indicated"); + //XXX error("Nothing indicated"); return; } } diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c index e2a09380b47..1666a5414e7 100644 --- a/source/blender/blenloader/intern/writefile.c +++ b/source/blender/blenloader/intern/writefile.c @@ -1417,13 +1417,14 @@ static void write_scenes(WriteData *wd, ListBase *scebase) writestruct(wd, DATA, "Editing", 1, ed); /* reset write flags too */ - WHILE_SEQ(&ed->seqbase) { + + WHILE_SEQ(&ed->seqbase) { //XXX todo replace WHILE_SEQ if(seq->strip) seq->strip->done= 0; writestruct(wd, DATA, "Sequence", 1, seq); } END_SEQ - WHILE_SEQ(&ed->seqbase) { + WHILE_SEQ(&ed->seqbase) { //XXX todo replace WHILE_SEQ if(seq->strip && seq->strip->done==0) { /* write strip with 'done' at 0 because readfile */ @@ -2238,7 +2239,7 @@ cleanup: close(outfd); if (cause) - error("Unable to make runtime: %s", cause); + ; //XXX error("Unable to make runtime: %s", cause); } #endif /* !__APPLE__ */ diff --git a/source/blender/editors/include/BDR_drawaction.h b/source/blender/editors/include/BDR_drawaction.h deleted file mode 100644 index 28f8af534fb..00000000000 --- a/source/blender/editors/include/BDR_drawaction.h +++ /dev/null @@ -1,88 +0,0 @@ -/** - * $Id: BDR_drawaction.h 11183 2007-07-06 09:59:18Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_DRAWACTION_H -#define BDR_DRAWACTION_H - -struct BezTriple; -struct Ipo; -struct IpoCurve; -struct gla2DDrawInfo; -struct bAction; -struct Object; -struct ListBase; - -/* ****************************** Base Structs ****************************** */ - -/* Keyframe Column Struct */ -typedef struct ActKeyColumn { - struct ActKeyColumn *next, *prev; - short sel, handle_type; - float cfra; - - /* only while drawing - used to determine if long-keyframe needs to be drawn */ - short modified; - short totcurve; -} ActKeyColumn; - -/* 'Long Keyframe' Struct */ -typedef struct ActKeyBlock { - struct ActKeyBlock *next, *prev; - short sel, handle_type; - float val; - float start, end; - - /* only while drawing - used to determine if block needs to be drawn */ - short modified; - short totcurve; -} ActKeyBlock; - - -/* ******************************* Methods ****************************** */ - -/* Action Generics */ -void draw_cfra_action(void); - -/* Channel Drawing */ -void draw_icu_channel(struct gla2DDrawInfo *di, struct IpoCurve *icu, float ypos); -void draw_ipo_channel(struct gla2DDrawInfo *di, struct Ipo *ipo, float ypos); -void draw_action_channel(struct gla2DDrawInfo *di, bAction *act, float ypos); -void draw_object_channel(struct gla2DDrawInfo *di, Object *ob, float ypos); - -/* Keydata Generation */ -void icu_to_keylist(struct IpoCurve *icu, ListBase *keys, ListBase *blocks); -void ipo_to_keylist(struct Ipo *ipo, ListBase *keys, ListBase *blocks); -void action_to_keylist(bAction *act, ListBase *keys, ListBase *blocks); -void ob_to_keylist(Object *ob, ListBase *keys, ListBase *blocks); - -#endif /* BDR_DRAWACTION_H */ - diff --git a/source/blender/editors/include/BDR_drawmesh.h b/source/blender/editors/include/BDR_drawmesh.h deleted file mode 100644 index 1c389799127..00000000000 --- a/source/blender/editors/include/BDR_drawmesh.h +++ /dev/null @@ -1,84 +0,0 @@ -/** - * $Id: BDR_drawmesh.h 11860 2007-08-28 08:53:36Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_DRAWMESH_H -#define BDR_DRAWMESH_H - -struct Image; -struct MTFace; -struct Object; -struct DerivedMesh; -struct Mesh; -struct EdgeHash; - -/** - * Enables or disable mipmapping for realtime images (textures). - * Note that this will will destroy all texture bindings in OpenGL. - * @see free_realtime_image() - * @param mipmap Turn mipmapping on (mipmap!=0) or off (mipmap==0). - */ -void set_mipmap(int mipmap); - -/** - * Enables or disable linear mipmap setting for realtime images (textures). - * Note that this will will destroy all texture bindings in OpenGL. - * @see free_realtime_image() - * @param mipmap Turn linear mipmapping on (linear!=0) or off (linear==0). - */ -void set_linear_mipmap(int linear); - -/** - * Returns the current setting for linear mipmapping. - */ -int get_linear_mipmap(void); - -/** - * Resets the realtime image cache variables. - */ -void clear_realtime_image_cache(void); - - -void update_realtime_image(struct Image *ima, int x, int y, int w, int h); -void free_realtime_image(struct Image *ima); -void free_all_realtime_images(void); -void make_repbind(struct Image *ima); -int set_tpage(struct MTFace *tface); - -void texpaint_enable_mipmap(void); -void texpaint_disable_mipmap(void); - -void draw_mesh_textured(struct Object *ob, struct DerivedMesh *dm, int facesel); -struct EdgeHash *get_tface_mesh_marked_edge_info(struct Mesh *me); -void init_realtime_GL(void); - -#endif /* BDR_DRAWMESH_H */ - diff --git a/source/blender/editors/include/BDR_drawobject.h b/source/blender/editors/include/BDR_drawobject.h deleted file mode 100644 index be512c7a154..00000000000 --- a/source/blender/editors/include/BDR_drawobject.h +++ /dev/null @@ -1,82 +0,0 @@ -/** - * $Id: BDR_drawobject.h 10455 2007-04-04 13:18:41Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_DRAWOBJECT_H -#define BDR_DRAWOBJECT_H - -#ifdef __cplusplus -extern "C" { -#endif - - -struct Object; -struct Nurb; -struct Lamp; -struct ListBase; -struct BoundBox; -struct Base; -struct BPoint; -struct BezTriple; -struct EditVert; -struct EditFace; -struct EditEdge; - -int set_gl_material(int nr); -int init_gl_materials(struct Object *ob, int check_alpha); - -void mesh_foreachScreenVert(void (*func)(void *userData, struct EditVert *eve, int x, int y, int index), void *userData, int clipVerts); -void mesh_foreachScreenEdge(void (*func)(void *userData, struct EditEdge *eed, int x0, int y0, int x1, int y1, int index), void *userData, int clipVerts); -void mesh_foreachScreenFace(void (*func)(void *userData, struct EditFace *efa, int x, int y, int index), void *userData); - -void lattice_foreachScreenVert(void (*func)(void *userData, struct BPoint *bp, int x, int y), void *userData); -void nurbs_foreachScreenVert(void (*func)(void *userData, struct Nurb *nu, struct BPoint *bp, struct BezTriple *bezt, int beztindex, int x, int y), void *userData); - -void drawcircball(int mode, float *cent, float rad, float tmat[][4]); -void get_local_bounds(struct Object *ob, float *center, float *size); - -/* drawing flags: */ -#define DRAW_PICKING 1 -#define DRAW_CONSTCOLOR 2 -void draw_object(struct Base *base, int flag); -void drawaxes(float size, int flag, char drawtype); - -void draw_object_ext(struct Base *base); -void drawsolidcube(float size); -extern void draw_object_backbufsel(struct Object *ob); -void draw_object_instance(struct Object *ob, int dt, int outline); - -#ifdef __cplusplus -} -#endif - -#endif /* BDR_DRAWOBJECT_H */ - diff --git a/source/blender/editors/include/BDR_editcurve.h b/source/blender/editors/include/BDR_editcurve.h deleted file mode 100644 index 889bf135972..00000000000 --- a/source/blender/editors/include/BDR_editcurve.h +++ /dev/null @@ -1,105 +0,0 @@ -/** - * $Id: BDR_editcurve.h 12519 2007-11-08 00:06:48Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_EDITCURVE_H -#define BDR_EDITCURVE_H - -struct Object; -struct Curve; -struct Nurb; -struct BezTriple; -struct BPoint; -struct BezTripleNurb; - -short isNurbsel(struct Nurb *nu); -int isNurbsel_count(struct Nurb *nu); -void printknots(void); -void load_editNurb(void); -void make_editNurb(void); -void remake_editNurb(void); -void separate_nurb(void); -short isNurbselUV(struct Nurb *nu, int *u, int *v, int flag); -void setflagsNurb(short flag); -void rotateflagNurb(short flag, float *cent, float rotmat[][3]); -void translateflagNurb(short flag, float *vec); -void weightflagNurb(short flag, float w, int mode); -void deleteflagNurb(short flag); -short extrudeflagNurb(int flag); -void adduplicateflagNurb(short flag); -void switchdirectionNurb2(void); -void switchdirection_knots(float *base, int tot); -void deselectall_nurb(void); -void hideNurb(int swap); -void revealNurb(void); -void selectswapNurb(void); -void subdivideNurb(void); - -int convertspline(short type, struct Nurb *nu); -void setsplinetype(short type); -void rotate_direction_nurb(struct Nurb *nu); -int is_u_selected(struct Nurb *nu, int u); -void make_selection_list_nurb(void); -void merge_2_nurb(struct Nurb *nu1, struct Nurb *nu2); -void merge_nurb(void); -void addsegment_nurb(void); -void mouse_nurb(void); -void spinNurb(float *dvec, short mode); -void addvert_Nurb(int mode); -void extrude_nurb(void); -void makecyclicNurb(void); -void selectconnected_nurb(void); -void selectrow_nurb(void); -void selectend_nurb(short selfirst, short doswap, short selstatus); -void select_more_nurb(void); -void select_less_nurb(void); -void select_next_nurb(void); -void select_prev_nurb(void); -void select_random_nurb(void); -void select_every_nth_nurb(void); -void adduplicate_nurb(void); -void delNurb(void); -void nurb_set_smooth(short event); -int join_curve(int type); -struct Nurb *addNurbprim(int type, int stype, int newname); -void default_curve_ipo(struct Curve *cu); -void add_primitiveCurve(int stype); -void add_primitiveNurb(int type); -void clear_tilt(void); -void clever_numbuts_curve(void); -int bezt_compare (const void *e1, const void *e2); -void setweightNurb( void ); -void setradiusNurb( void ); -void smoothradiusNurb( void ); - -extern void undo_push_curve(char *name); - -#endif /* BDR_EDITCURVE_H */ diff --git a/source/blender/editors/include/BDR_editface.h b/source/blender/editors/include/BDR_editface.h deleted file mode 100644 index c9f8bdb589f..00000000000 --- a/source/blender/editors/include/BDR_editface.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * $Id: BDR_editface.h 12139 2007-09-25 03:31:12Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_EDITFACE_H -#define BDR_EDITFACE_H - -struct MTFace; -struct EditFace; -struct Mesh; -struct MCol; - -struct MTFace *get_active_mtface(struct EditFace **efa, struct MCol **mcol, short sloppy); -void calculate_uv_map(unsigned short mapmode); -void default_uv(float uv[][2], float size); -void make_tfaces(struct Mesh *me); -void reveal_tface(void); -void hide_tface(void); -void select_linked_tfaces(int mode); -void deselectall_tface(void); -void selectswap_tface(void); -void rotate_uv_tface(void); -void mirror_uv_tface(void); -int minmax_tface(float *min, float *max); -void face_select(void); -void face_borderselect(void); -void uv_autocalc_tface(void); -void set_texturepaint(void); -void get_same_uv(void); -void seam_mark_clear_tface(short mode); - -#endif /* BDR_EDITFACE_H */ - diff --git a/source/blender/editors/include/BDR_editmball.h b/source/blender/editors/include/BDR_editmball.h deleted file mode 100644 index b7b852c4206..00000000000 --- a/source/blender/editors/include/BDR_editmball.h +++ /dev/null @@ -1,56 +0,0 @@ -/** - * $Id: BDR_editmball.h 10893 2007-06-08 14:17:13Z jiri $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_EDITMBALL_H -#define BDR_EDITMBALL_H - -void make_editMball(void); -void load_editMball(void); - -/** - * @attention The argument is discarded. It is there for - * compatibility. - */ -void add_primitiveMball(int); -void deselectall_mball(void); -void selectinverse_mball(void); -void selectrandom_mball(void); -void mouse_mball(void); -void adduplicate_mball(void); -void delete_mball(void); -void freeMetaElemlist(struct ListBase *lb); -void undo_push_mball(char *name); -void hide_mball(char hide); -void reveal_mball(void); - -#endif /* BDR_EDITMBALL_H */ - diff --git a/source/blender/editors/include/BDR_editobject.h b/source/blender/editors/include/BDR_editobject.h deleted file mode 100644 index 5aeeb4d5c1b..00000000000 --- a/source/blender/editors/include/BDR_editobject.h +++ /dev/null @@ -1,128 +0,0 @@ -/** - * $Id: BDR_editobject.h 12696 2007-11-27 19:23:26Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_EDITOBJECT_H -#define BDR_EDITOBJECT_H - -struct Object; -struct Tex; -struct Material; -struct Base; -struct HookModifierData; -struct Scene; - -void add_object_draw(int type); -void add_objectLamp(short type); -void free_and_unlink_base_from_scene(struct Scene *scene, struct Base *base); -void free_and_unlink_base(struct Base *base); -void delete_obj(int ok); -void make_track(void); -void apply_obmat(struct Object *ob); -void clear_parent(void); -void clear_track(void); -void clear_object(char mode); -void reset_slowparents(void); -void set_slowparent(void); -void make_vertex_parent(void); -int test_parent_loop(struct Object *par, struct Object *ob); -void make_parent(void); -void make_proxy(void); - -#define EM_WAITCURSOR (1 << 0) -#define EM_FREEDATA (1 << 1) -#define EM_FREEUNDO (1 << 2) - -void exit_editmode(int flag); -void check_editmode(int type); -void enter_editmode(int wc); - -void exit_paint_modes(void); - -void docenter(int centermode); -void docenter_new(void); -void docenter_cursor(void); -void movetolayer(void); -void special_editmenu(void); -void convertmenu(void); -void copy_attr_menu(void); -void copy_attr(short event); -void link_to_scene(unsigned short nr); -void make_links_menu(void); -void make_links(short event); -void make_duplilist_real(void); -void apply_object(void); - -/* old transform */ -void apply_keyb_grid(float *val, float fac1, float fac2, float fac3, int invert); -void headerprint(char *str); -/* used for old game engine collision optimize */ -int cylinder_intersect_test(void); -int sphere_intersect_test(void); - - -void std_rmouse_transform(void (*xf_func)(int, int)); -void rightmouse_transform(void); -void single_object_users(int flag); -void new_id_matar(struct Material **matar, int totcol); -void single_obdata_users(int flag); -void single_mat_users(int flag); -void do_single_tex_user(struct Tex **from); -void single_tex_users_expand(void); -void single_mat_users_expand(void); -void single_user(void); -void make_local_menu(void); -void make_local(int mode); -void adduplicate(int mode, int dupflag); /* when the dupflag is 0 no data is duplicated */ -void selectlinks_menu(void); -void selectlinks(int nr); -void image_aspect(void); -void set_ob_ipoflags(void); -void select_select_keys(void); -int vergbaseco(const void *a1, const void *a2); -void auto_timeoffs(void); -void texspace_edit(void); -void flip_subdivison(int); -void mirrormenu(void); -void hookmenu(void); /* object mode hook menu */ - - -void add_hook(void); -void hook_select(struct HookModifierData *hmd); -int hook_getIndexArray(int *tot, int **indexar, char *name, float *cent_r); - -int object_is_libdata(struct Object *ob); -int object_data_is_libdata(struct Object *ob); -void hide_objects(int select); -void show_objects(void); - -#endif /* BDR_EDITOBJECT_H */ - diff --git a/source/blender/editors/include/BDR_imagepaint.h b/source/blender/editors/include/BDR_imagepaint.h deleted file mode 100644 index f40e9a3102a..00000000000 --- a/source/blender/editors/include/BDR_imagepaint.h +++ /dev/null @@ -1,44 +0,0 @@ -/** - * $Id: BDR_imagepaint.h 8390 2006-08-27 13:29:00Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_IMAGEPAINT_H -#define BDR_IMAGEPAINT_H - -void imagepaint_redraw_tool(void); -void imagepaint_pick(short mousebutton); -void imagepaint_paint(short mousebutton, short texturepaint); - -void imagepaint_undo(); -void free_imagepaint(); - -#endif /* BDR_IMAGEPAINT_H */ - diff --git a/source/blender/editors/include/BDR_sculptmode.h b/source/blender/editors/include/BDR_sculptmode.h deleted file mode 100644 index ca9d77d179f..00000000000 --- a/source/blender/editors/include/BDR_sculptmode.h +++ /dev/null @@ -1,90 +0,0 @@ -/* - * $Id: BDR_sculptmode.h 13014 2007-12-26 23:08:00Z nicholasbishop $ - * - * ***** 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) 2006 by Nicholas Bishop - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BDR_SCULPTMODE_H -#define BDR_SCULPTMODE_H - -#include "DNA_listBase.h" -#include "DNA_vec_types.h" -#include "BKE_sculpt.h" -#include "transform.h" - -struct uiBlock; -struct BrushData; -struct EditData; -struct IndexNode; -struct KeyBlock; -struct Mesh; -struct Object; -struct PartialVisibility; -struct Scene; -struct ScrArea; -struct SculptData; -struct SculptStroke; - -struct SculptSession *sculpt_session(void); -struct SculptData *sculpt_data(void); - -/* Memory */ -void sculptmode_correct_state(void); - -/* Interface */ -void sculptmode_draw_interface_tools(struct uiBlock *block,unsigned short cx, unsigned short cy); -void sculptmode_draw_interface_brush(struct uiBlock *block,unsigned short cx, unsigned short cy); -void sculptmode_draw_interface_textures(struct uiBlock *block,unsigned short cx, unsigned short cy); -void sculptmode_rem_tex(void*,void*); -void sculptmode_propset_init(PropsetMode mode); -void sculptmode_propset(const unsigned short event); -void sculptmode_selectbrush_menu(void); -void sculptmode_draw_mesh(int); -void sculpt_paint_brush(char clear); -void sculpt_stroke_draw(); - -struct BrushData *sculptmode_brush(void); -float tex_angle(void); -void do_symmetrical_brush_actions(struct EditData *e, short *, short *); - -void sculptmode_update_tex(void); -char sculpt_modifiers_active(struct Object *ob); -void sculpt(void); -void set_sculptmode(void); - -/* Stroke */ -void sculpt_stroke_new(const int max); -void sculpt_stroke_free(); -void sculpt_stroke_add_point(const short x, const short y); -void sculpt_stroke_apply(struct EditData *); -void sculpt_stroke_apply_all(struct EditData *e); -void sculpt_stroke_draw(); - - -/* Partial Mesh Visibility */ -void sculptmode_pmv(int mode); - -#endif diff --git a/source/blender/editors/include/BDR_unwrapper.h b/source/blender/editors/include/BDR_unwrapper.h deleted file mode 100644 index 24f32a11211..00000000000 --- a/source/blender/editors/include/BDR_unwrapper.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * $Id: BDR_unwrapper.h 10331 2007-03-22 20:32:20Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_UNWRAPPER_H -#define BDR_UNWRAPPER_H - -struct Mesh; - -void set_seamtface(void); /* set TF_SEAM flags in tfaces */ -void select_linked_tfaces_with_seams(int mode, struct Mesh *me, unsigned int index); - -void unwrap_lscm(short seamcut); /* unwrap faces selected in 3d view */ -void minimize_stretch_tface_uv(void); /* optimize faces selected in uv editor */ -void pack_charts_tface_uv(void); - -/* for live mode: no undo pushes, caching for quicky re-unwrap */ -void unwrap_lscm_live_begin(void); -void unwrap_lscm_live_re_solve(void); -void unwrap_lscm_live_end(short cancel); - -#endif /* BDR_UNWRAPPER_H */ - diff --git a/source/blender/editors/include/BDR_vpaint.h b/source/blender/editors/include/BDR_vpaint.h deleted file mode 100644 index 0bda2010a74..00000000000 --- a/source/blender/editors/include/BDR_vpaint.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * $Id: BDR_vpaint.h 8971 2006-11-20 12:08:06Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BDR_VPAINT_H -#define BDR_VPAINT_H - -struct Mesh; -struct MDeformVert; /* __NLA */ - -unsigned int rgba_to_mcol(float r, float g, float b, float a); -void do_shared_vertexcol(struct Mesh *me); -void make_vertexcol(int shade); - -void clear_vpaint(void); -void clear_vpaint_selectedfaces(void); -void vpaint_dogamma(void); -void sample_vpaint(void); - -void free_vertexpaint(void); -void vertex_paint(void); -void set_vpaint(void); - -void set_wpaint(void); -void clear_wpaint_selectedfaces(void); -void weight_paint(void); - - -#endif /* BDR_VPAINT_H */ - diff --git a/source/blender/editors/include/BIF_butspace.h b/source/blender/editors/include/BIF_butspace.h deleted file mode 100644 index dae86df7712..00000000000 --- a/source/blender/editors/include/BIF_butspace.h +++ /dev/null @@ -1,140 +0,0 @@ -/** - * $Id: BIF_butspace.h 12682 2007-11-26 22:09:57Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ -#ifndef BIF_BUTSPACE_H -#define BIF_BUTSPACE_H - -/* all internal/external calls and event codes for buttons space */ -/* should be split in 2 parts... */ - -struct Base; -struct ID; - -/* external, butspace.c */ -extern void do_butspace(unsigned short event); -extern void redraw_test_buttons(struct Object *new); - -extern char *image_type_pup(void); - -/* buttons_editing.c */ -extern void validate_editbonebutton_cb(void *bonev, void *namev); - -/* buts->mainb old */ -#define BUTS_VIEW 0 -#define BUTS_LAMP 1 -#define BUTS_MAT 2 -#define BUTS_TEX 3 -#define BUTS_ANIM 4 -#define BUTS_WORLD 5 -#define BUTS_RENDER 6 -#define BUTS_EDIT 7 -#define BUTS_GAME 8 -#define BUTS_FPAINT 9 -#define BUTS_RADIO 10 -#define BUTS_SCRIPT 11 -#define BUTS_SOUND 12 -#define BUTS_CONSTRAINT 13 -#define BUTS_EFFECTS 14 - -/* warning: the values of these defines are used in sbuts->tabs[7] */ -/* buts->mainb new */ -#define CONTEXT_SCENE 0 -#define CONTEXT_OBJECT 1 -#define CONTEXT_TYPES 2 -#define CONTEXT_SHADING 3 -#define CONTEXT_EDITING 4 -#define CONTEXT_SCRIPT 5 -#define CONTEXT_LOGIC 6 - -/* buts->tab new */ -#define TAB_SHADING_MAT 0 -#define TAB_SHADING_TEX 1 -#define TAB_SHADING_RAD 2 -#define TAB_SHADING_WORLD 3 -#define TAB_SHADING_LAMP 4 - -#define TAB_OBJECT_OBJECT 0 -#define TAB_OBJECT_PHYSICS 1 -#define TAB_OBJECT_PARTICLE 2 - -#define TAB_SCENE_RENDER 0 -#define TAB_SCENE_WORLD 1 -#define TAB_SCENE_ANIM 2 -#define TAB_SCENE_SOUND 3 - - -/* buts->scaflag */ -#define BUTS_SENS_SEL 1 -#define BUTS_SENS_ACT 2 -#define BUTS_SENS_LINK 4 -#define BUTS_CONT_SEL 8 -#define BUTS_CONT_ACT 16 -#define BUTS_CONT_LINK 32 -#define BUTS_ACT_SEL 64 -#define BUTS_ACT_ACT 128 -#define BUTS_ACT_LINK 256 - - -/* buttons grid */ -#define PANELX 320 -#define PANELY 0 -#define PANELW 318 -#define PANELH 204 - -#define BUTW1 300 -#define BUTW2 145 -#define BUTW3 93 -#define BUTW4 67 -#define ICONBUTW 20 -#define BUTH 22 - -#define YSPACE 6 -#define XSPACE 10 -#define PANEL_YMAX 210 -#define PANEL_XMAX 310 - -#define X1CLM1 10 - -#define X2CLM1 X1CLM1 -#define X2CLM2 165 - -#define X3CLM1 X1CLM1 -#define X3CLM2 113 -#define X3CLM3 217 - -#define X4CLM1 X1CLM1 -#define X4CLM2 77 -#define X4CLM3 165 -#define X4CLM4 232 - - -#endif - diff --git a/source/blender/editors/include/BIF_cursors.h b/source/blender/editors/include/BIF_cursors.h deleted file mode 100644 index cdbe5293dc7..00000000000 --- a/source/blender/editors/include/BIF_cursors.h +++ /dev/null @@ -1,103 +0,0 @@ -/** - * $Id: BIF_cursors.h 7739 2006-06-15 14:22:59Z broken $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - - - -#ifndef __BLI_CURSORS_DOT_H__ -#define __BLI_CURSORS_DOT_H__ - -void InitCursorData(void); -short GetBlenderCursor(void); -void SetBlenderCursor(short cursornum); - -//typedef struct BCursor_s BCursor; -typedef struct BCursor { - - char *small_bm; - char *small_mask; - - char small_sizex; - char small_sizey; - char small_hotx; - char small_hoty; - - char *big_bm; - char *big_mask; - - char big_sizex; - char big_sizey; - char big_hotx; - char big_hoty; - - char fg_color; - char bg_color; - -} BCursor; - -#define LASTCURSOR -2 -#define SYSCURSOR -1 -enum { - BC_NW_ARROWCURSOR=0, - BC_NS_ARROWCURSOR, - BC_EW_ARROWCURSOR, - BC_WAITCURSOR, - BC_CROSSCURSOR, - BC_EDITCROSSCURSOR, - BC_BOXSELCURSOR, - BC_KNIFECURSOR, - BC_VLOOPCURSOR, - BC_TEXTEDITCURSOR, - BC_PAINTBRUSHCURSOR, - BC_HANDCURSOR, - BC_NSEW_SCROLLCURSOR, - BC_NS_SCROLLCURSOR, - BC_EW_SCROLLCURSOR, - BC_EYEDROPPER_CURSOR, -/* --- ALWAYS LAST ----- */ - BC_NUMCURSORS, -}; - - -enum { - BC_BLACK=0, - BC_WHITE, - BC_RED, - BC_BLUE, - BC_GREEN, - BC_YELLOW -}; - -#define SMALL_CURSOR 0 -#define BIG_CURSOR 1 - -#endif - diff --git a/source/blender/editors/include/BIF_drawimage.h b/source/blender/editors/include/BIF_drawimage.h deleted file mode 100644 index 3d48df0ea31..00000000000 --- a/source/blender/editors/include/BIF_drawimage.h +++ /dev/null @@ -1,74 +0,0 @@ -/** - * $Id: BIF_drawimage.h 12198 2007-10-03 10:36:04Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_DRAWIMAGE_H -#define BIF_DRAWIMAGE_H - -struct ScrArea; -struct SpaceImage; -struct Render; -struct Image; -struct ImBuf; -struct uiBlock; -struct MTFace; - -void do_imagebuts(unsigned short event); -void calc_image_view(struct SpaceImage *sima, char mode); -void drawimagespace(struct ScrArea *sa, void *spacedata); -void image_changed(struct SpaceImage *sima, struct Image *image); -int draw_uvs_face_check(void); -void tface_center(struct MTFace *tf, float cent[2], void * isquad); -void draw_uvs_sima(void); -void image_set_tile(struct SpaceImage *sima, int dotile); -void image_home(void); -void image_viewmove(int mode); -void image_viewzoom(unsigned short event, int invert); -void image_viewcenter(void); -void uvco_to_areaco(float *vec, short *mval); -void uvco_to_areaco_noclip(float *vec, int *mval); -void what_image(struct SpaceImage *sima); -void image_preview_event(int event); - -void image_info(struct Image *ima, struct ImBuf *ibuf, char *str); -void imagespace_composite_flipbook(struct ScrArea *sa); - -void imagewindow_render_callbacks(struct Render *re); -void imagewindow_toggle_render(void); -void imagewindow_swap_render_rects(void); -void imagewin_store_spare(void); -struct ImBuf *imagewindow_get_ibuf(struct SpaceImage *sima); - -void image_editvertex_buts(struct uiBlock *block); -void image_editcursor_buts(struct uiBlock *block); - -#endif - diff --git a/source/blender/editors/include/BIF_drawoops.h b/source/blender/editors/include/BIF_drawoops.h deleted file mode 100644 index 38c38c1ba04..00000000000 --- a/source/blender/editors/include/BIF_drawoops.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * $Id: BIF_drawoops.h 6135 2005-12-16 13:50:45Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_DRAWOOPS_H -#define BIF_DRAWOOPS_H - -void give_oopslink_line(Oops *oops, OopsLink *ol, float *v1, float *v2); -void mysbox(float x1, float y1, float x2, float y2); -void boundbox_oops(short sel); - -#endif - diff --git a/source/blender/editors/include/BIF_drawscene.h b/source/blender/editors/include/BIF_drawscene.h deleted file mode 100644 index 88e0ae906d4..00000000000 --- a/source/blender/editors/include/BIF_drawscene.h +++ /dev/null @@ -1,35 +0,0 @@ -/** - * $Id: BIF_drawscene.h 229 2002-12-27 13:11:01Z mein $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -struct Scene; -void set_scene(struct Scene *sce); - diff --git a/source/blender/editors/include/BIF_drawscript.h b/source/blender/editors/include/BIF_drawscript.h deleted file mode 100644 index b50f12e836b..00000000000 --- a/source/blender/editors/include/BIF_drawscript.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * - * - * ***** 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. - * - * This is a new part of Blender. - * - * Contributor(s): Willian P. Germano. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_DRAWSCRIPT_H -#define BIF_DRAWSCRIPT_H - -struct ScrArea; -struct SpaceScript; - -void free_scriptspace(struct SpaceScript *sc); - -#endif /* BIF_DRAWSCRIPT_H */ diff --git a/source/blender/editors/include/BIF_drawseq.h b/source/blender/editors/include/BIF_drawseq.h deleted file mode 100644 index 495c99c47d7..00000000000 --- a/source/blender/editors/include/BIF_drawseq.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * $Id: BIF_drawseq.h 12177 2007-10-01 08:03:11Z schlaile $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_DRAWSEQ_H -#define BIF_DRAWSEQ_H - -struct ScrArea; -struct Sequence; - -void drawprefetchseqspace(struct ScrArea *sa, void *spacedata); -void drawseqspace(struct ScrArea *sa, void *spacedata); -void set_special_seq_update(int val); - -void seq_viewmove(SpaceSeq *sseq); -void seq_reset_imageofs(SpaceSeq *sseq); -#endif - diff --git a/source/blender/editors/include/BIF_drawtext.h b/source/blender/editors/include/BIF_drawtext.h deleted file mode 100644 index e08e67b8052..00000000000 --- a/source/blender/editors/include/BIF_drawtext.h +++ /dev/null @@ -1,54 +0,0 @@ -/** - * $Id: BIF_drawtext.h 4428 2005-05-13 16:11:28Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_DRAWTEXT_H -#define BIF_DRAWTEXT_H - -struct ScrArea; -struct SpaceText; -struct Text; - -void unlink_text(struct Text *text); - -void free_textspace(struct SpaceText *st); - -void txt_write_file(struct Text *text); -void add_text_fs(char *file); - -void free_txt_data(void); -void pop_space_text(struct SpaceText *st); - -void get_format_string(void); -void do_brackets(void); - -#endif - diff --git a/source/blender/editors/include/BIF_editaction.h b/source/blender/editors/include/BIF_editaction.h deleted file mode 100644 index 9fa098bc846..00000000000 --- a/source/blender/editors/include/BIF_editaction.h +++ /dev/null @@ -1,162 +0,0 @@ -/** - * $Id: BIF_editaction.h 12065 2007-09-17 11:41:12Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): 2007, Joshua Leung, Action Editor Recode - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITACTION_H -#define BIF_EDITACTION_H - -/* some interface related sizes*/ -#define CHANNELHEIGHT 16 -#define CHANNELSKIP 2 -#define NAMEWIDTH 164 -#define SLIDERWIDTH 125 -#define ACTWIDTH (G.saction->actwidth) - -/* Some types for easier type-testing */ -enum { - ACTTYPE_NONE= 0, - ACTTYPE_ACHAN, - ACTTYPE_CONCHAN, - ACTTYPE_ICU, - ACTTYPE_FILLIPO, - ACTTYPE_FILLCON, - ACTTYPE_IPO, - ACTTYPE_SHAPEKEY -}; - -/* Macros for easier/more consistant state testing */ -#define VISIBLE_ACHAN(achan) ((achan->flag & ACHAN_HIDDEN)==0) -#define EDITABLE_ACHAN(achan) ((VISIBLE_ACHAN(achan)) && ((achan->flag & ACHAN_PROTECTED)==0)) -#define EXPANDED_ACHAN(achan) ((VISIBLE_ACHAN(achan)) && (achan->flag & ACHAN_EXPANDED)) -#define SEL_ACHAN(achan) ((achan->flag & ACHAN_SELECTED) || (achan->flag & ACHAN_HILIGHTED)) -#define FILTER_IPO_ACHAN(achan) ((achan->flag & ACHAN_SHOWIPO)) -#define FILTER_CON_ACHAN(achan) ((achan->flag & ACHAN_SHOWCONS)) - -#define EDITABLE_CONCHAN(conchan) ((conchan->flag & CONSTRAINT_CHANNEL_PROTECTED)==0) -#define SEL_CONCHAN(conchan) (conchan->flag & CONSTRAINT_CHANNEL_SELECT) - -#define EDITABLE_ICU(icu) ((icu->flag & IPO_PROTECT)==0) -#define SEL_ICU(icu) (icu->flag & IPO_SELECT) - -#define NLA_ACTION_SCALED (G.saction->pin==0 && OBACT && OBACT->action) -#define NLA_IPO_SCALED (OBACT && OBACT->action && G.sipo->pin==0 && G.sipo->actname) - -/* constants for setting ipo-interpolation type */ -enum { - SET_IPO_MENU = -1, - SET_IPO_POPUP = 0, - - SET_IPO_CONSTANT, - SET_IPO_LINEAR, - SET_IPO_BEZIER, -}; - -/* constants for setting ipo-extrapolation type */ -enum { - - SET_EXTEND_MENU = 9, - SET_EXTEND_POPUP = 10, - - SET_EXTEND_CONSTANT, - SET_EXTEND_EXTRAPOLATION, - SET_EXTEND_CYCLIC, - SET_EXTEND_CYCLICEXTRAPOLATION -}; - - -struct bAction; -struct bActionChannel; -struct bPoseChannel; -struct Object; -struct Ipo; -struct BWinEvent; -struct Key; -struct ListBase; - -/* Key operations */ -void transform_action_keys(int mode, int dummy); -void duplicate_action_keys(void); -void snap_action_keys(short mode); -void mirror_action_keys(short mode); -void insertkey_action(void); -void delete_action_keys(void); -void delete_action_channels(void); -void clean_action(void); - -/* Column/Channel Key select */ -void column_select_action_keys(int mode); -void selectall_action_keys(short mval[], short mode, short selectmode); -void markers_selectkeys_between(void); - -/* Action Data Copying */ -void free_actcopybuf(void); -void copy_actdata(void); -void paste_actdata(void); - -/* channel/strip operations */ -void up_sel_action(void); -void down_sel_action(void); -void top_sel_action(void); -void bottom_sel_action(void); - -/* IPO/Handle Types */ -void sethandles_action_keys(int code); -void action_set_ipo_flags(short mode, short event); - -/* Select */ -void borderselect_action(void); -void deselect_action_keys(short test, short sel); -void deselect_action_channels(short test); -void deselect_actionchannels(struct bAction *act, short test); -int select_channel(struct bAction *act, struct bActionChannel *achan, int selectmode); -void select_actionchannel_by_name(struct bAction *act, char *name, int select); - -/* ShapeKey stuff */ -struct Key *get_action_mesh_key(void); -int get_nearest_key_num(struct Key *key, short *mval, float *x); - -void *get_nearest_act_channel(short mval[], short *ret_type); - -/* Action */ -struct bActionChannel *get_hilighted_action_channel(struct bAction* action); -struct bAction *add_empty_action(char *name); -struct bAction *ob_get_action(struct Object *ob); - -void actdata_filter(ListBase *act_data, int filter_mode, void *data, short datatype); -void *get_action_context(short *datatype); - -void remake_action_ipos(struct bAction *act); - -/* event handling */ -void winqreadactionspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); - -#endif - diff --git a/source/blender/editors/include/BIF_editarmature.h b/source/blender/editors/include/BIF_editarmature.h deleted file mode 100644 index 1b2ad78c881..00000000000 --- a/source/blender/editors/include/BIF_editarmature.h +++ /dev/null @@ -1,142 +0,0 @@ -/** - * $Id: BIF_editarmature.h 11981 2007-09-09 11:05:21Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ -#ifndef BIF_EDITARMATURE_H -#define BIF_EDITARMATURE_H - -struct Object; -struct Base; -struct Bone; -struct bArmature; -struct ListBase; - -typedef struct EditBone -{ - struct EditBone *next, *prev; - struct EditBone *parent;/* Editbones have a one-way link (i.e. children refer - to parents. This is converted to a two-way link for - normal bones when leaving editmode. */ - void *temp; /* Used to store temporary data */ - - char name[32]; - float roll; /* Roll along axis. We'll ultimately use the axis/angle method - for determining the transformation matrix of the bone. The axis - is tail-head while roll provides the angle. Refer to Graphics - Gems 1 p. 466 (section IX.6) if it's not already in here somewhere*/ - - float head[3]; /* Orientation and length is implicit during editing */ - float tail[3]; - /* All joints are considered to have zero rotation with respect to - their parents. Therefore any rotations specified during the - animation are automatically relative to the bones' rest positions*/ - int flag; - - int parNr; /* Used for retrieving values from the menu system */ - - float dist, weight; - float xwidth, length, zwidth; /* put them in order! transform uses this as scale */ - float ease1, ease2; - float rad_head, rad_tail; - short layer, segments; - - float oldlength; /* for envelope scaling */ - -} EditBone; - - -void adduplicate_armature(void); -void addvert_armature(void); -void add_primitiveArmature(int type); -void apply_rot_armature (struct Object *ob, float mat[3][3]); -void docenter_armature (struct Object *ob, int centermode); - -void clear_armature(struct Object *ob, char mode); - -void delete_armature(void); -void deselectall_armature(int toggle, int doundo); -void deselectall_posearmature (struct Object *ob, int test, int doundo); -int draw_armature(struct Base *base, int dt); -void extrude_armature(int forked); -void subdivide_armature(int numcuts); - -void free_editArmature(void); - -int join_armature(void); -void load_editArmature(void); - -void make_bone_parent(void); -void clear_bone_parent(void); -struct Bone *get_indexed_bone (struct Object *ob, int index); - -void make_editArmature(void); -void make_trans_bones (char mode); - -int do_pose_selectbuffer(struct Base *base, unsigned int *buffer, short hits); - -void mouse_armature(void); -void remake_editArmature(void); -void selectconnected_armature(void); -void selectconnected_posearmature(void); -void select_bone_parent(void); -void unique_editbone_name (struct ListBase *ebones, char *name); - -void auto_align_armature(short mode); - -void create_vgroups_from_armature(struct Object *ob, struct Object *par); -void add_verts_to_dgroups(struct Object *ob, struct Object *par, int heat, int mirror); - -void hide_selected_pose_bones(void); -void hide_unselected_pose_bones(void); -void show_all_pose_bones(void); - -int bone_looper(struct Object *ob, struct Bone *bone, void *data, - int (*bone_func)(struct Object *, struct Bone *, void *)); - -void undo_push_armature(char *name); -void armature_bone_rename(struct bArmature *arm, char *oldname, char *newname); -void armature_flip_names(void); -EditBone *armature_bone_get_mirrored(struct EditBone *ebo); -void transform_armature_mirror_update(void); - -void hide_selected_armature_bones(void); -void hide_unselected_armature_bones(void); -void show_all_armature_bones(void); - -#define BONESEL_ROOT 0x10000000 -#define BONESEL_TIP 0x20000000 -#define BONESEL_BONE 0x40000000 -#define BONESEL_ANY (BONESEL_TIP|BONESEL_ROOT|BONESEL_BONE) - -#define BONESEL_NOSEL 0x80000000 /* Indicates a negative number */ - -#endif - - diff --git a/source/blender/editors/include/BIF_editconstraint.h b/source/blender/editors/include/BIF_editconstraint.h deleted file mode 100644 index edc1a610694..00000000000 --- a/source/blender/editors/include/BIF_editconstraint.h +++ /dev/null @@ -1,72 +0,0 @@ -/** - * $Id: BIF_editconstraint.h 12339 2007-10-22 10:49:34Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITCONSTRAINT_H -#define BIF_EDITCONSTRAINT_H - -struct ID; -struct ListBase; -struct Object; -struct bConstraint; -struct bConstraintChannel; -struct Text; - -/* generic constraint editing functions */ - -struct bConstraint *add_new_constraint(short type); - -void add_constraint_to_object(struct bConstraint *con, struct Object *ob); - -struct ListBase *get_active_constraints(struct Object *ob); -struct bConstraint *get_active_constraint(struct Object *ob); -struct ListBase *get_active_constraint_channels (struct Object *ob, int forcevalid); -struct bConstraintChannel *get_active_constraint_channel(struct Object *ob); - -void object_test_constraints(struct Object *owner); - -void add_constraint(int only_IK); -void ob_clear_constraints(void); - -void rename_constraint(struct Object *ob, struct bConstraint *con, char *newname); - - -/* a few special functions for PyConstraints */ -char *buildmenu_pyconstraints(struct Text *con_text, int *pyconindex); -void validate_pyconstraint_cb(void *arg1, void *arg2); -void update_pyconstraint_cb(void *arg1, void *arg2); - -/* two special functions for ChildOf Constriant */ -void childof_const_setinv (void *conv, void *unused); -void childof_const_clearinv(void *conv, void *unused); - -#endif - diff --git a/source/blender/editors/include/BIF_editdeform.h b/source/blender/editors/include/BIF_editdeform.h deleted file mode 100644 index 771ee87ab77..00000000000 --- a/source/blender/editors/include/BIF_editdeform.h +++ /dev/null @@ -1,76 +0,0 @@ -/** - * $Id: BIF_editdeform.h 12697 2007-11-27 21:16:47Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_DEFORM_H -#define BIF_DEFORM_H - -#define WEIGHT_REPLACE 1 -#define WEIGHT_ADD 2 -#define WEIGHT_SUBTRACT 3 - -struct Object; -struct Mesh; -struct MDeformVert; -struct MDeformWeight; -struct bDeformGroup; - -struct bDeformGroup *add_defgroup_name (struct Object *ob, char *name); -void add_defgroup (struct Object *ob); -void del_defgroup_in_object_mode ( Object *ob ); -void del_defgroup (struct Object *ob); -void duplicate_defgroup ( struct Object *ob ); -void assign_verts_defgroup (void); -void remove_verts_defgroup (int allverts); -void sel_verts_defgroup (int select); - -struct MDeformWeight *get_defweight (struct MDeformVert *dv, int defgroup); -struct MDeformWeight *verify_defweight (struct MDeformVert *dv, int defgroup); - - -void add_vert_to_defgroup (struct Object *ob, struct bDeformGroup *dg, - int vertnum, float weight, - int assignmode); -void remove_vert_defgroup (struct Object *ob, struct bDeformGroup *dg, - int vertnum); -float get_vert_defgroup (struct Object *ob, struct bDeformGroup *dg, - int vertnum); -void create_dverts(ID *id); - -void vertexgroup_select_by_name(struct Object *ob, char *name); - -extern void object_apply_deform(struct Object *ob); - -void vgroup_assign_with_menu(void); -void vgroup_operation_with_menu(void); - -#endif - diff --git a/source/blender/editors/include/BIF_editfont.h b/source/blender/editors/include/BIF_editfont.h deleted file mode 100644 index 64187e46862..00000000000 --- a/source/blender/editors/include/BIF_editfont.h +++ /dev/null @@ -1,73 +0,0 @@ -/** - * $Id: BIF_editfont.h 5286 2005-09-15 17:32:24Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#include - -#ifndef BIF_EDITFONT_H -#define BIF_EDITFONT_H - -struct Text; - -extern char *BIF_lorem; -extern wchar_t *copybuf; -extern wchar_t *copybufinfo; - -typedef struct unicodect -{ - char *name; - char *longname; - int start; - int end; -} unicodect; - -void do_textedit(unsigned short event, short val, unsigned long _ascii); -void make_editText(void); -void load_editText(void); -void remake_editText(void); -void free_editText(void); -void paste_editText(void); -void txt_export_to_object(struct Text *text); -void txt_export_to_objects(struct Text *text); -void undo_push_font(char *); -void load_3dtext_fs(char *); -void add_lorem(void); -void paste_unicodeText(char *filename); - -/** - * @attention The argument is discarded. It is there for - * compatibility. - */ -void add_primitiveFont(int); -void to_upper(void); - -#endif - diff --git a/source/blender/editors/include/BIF_editgroup.h b/source/blender/editors/include/BIF_editgroup.h deleted file mode 100644 index dded79541bc..00000000000 --- a/source/blender/editors/include/BIF_editgroup.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * $Id: BIF_editgroup.h 7877 2006-06-24 18:37:21Z desoto $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -struct Group; -struct Base; - -void add_selected_to_group(struct Group *group); -void rem_selected_from_group(void); -void group_operation_with_menu(void); -void group_operation(int mode); - diff --git a/source/blender/editors/include/BIF_editkey.h b/source/blender/editors/include/BIF_editkey.h deleted file mode 100644 index 760809f7b1e..00000000000 --- a/source/blender/editors/include/BIF_editkey.h +++ /dev/null @@ -1,70 +0,0 @@ -/** - * $Id: BIF_editkey.h 10579 2007-04-25 11:57:02Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITKEY_H -#define BIF_EDITKEY_H - -struct Key; -struct KeyBlock; -struct Mesh; -struct Object; -struct Lattice; -struct Curve; -struct uiBlock; -struct BezTriple; -struct IpoCurve; - -void mesh_to_key(struct Mesh *me, struct KeyBlock *kb); -void key_to_mesh(struct KeyBlock *kb, struct Mesh *me); -void insert_meshkey(struct Mesh *me, short rel); - -void latt_to_key(struct Lattice *lt, struct KeyBlock *kb); -void key_to_latt(struct KeyBlock *kb, struct Lattice *lt); -void insert_lattkey(struct Lattice *lt, short rel); - -void curve_to_key(struct Curve *cu, struct KeyBlock *kb, ListBase *nurb); -void key_to_curve(struct KeyBlock *kb, struct Curve *cu, ListBase *nurb); -void insert_curvekey(struct Curve *cu, short rel); - -void insert_shapekey(struct Object *ob); - -void delete_key(struct Object *ob); -void move_keys(struct Object *ob); - -void make_rvk_slider(struct uiBlock *block, struct Object *ob, int keynum, - int x, int y, int w, int h, char *tip); - -// FIXME: move me somewhere else -struct BezTriple *get_bezt_icu_time(struct IpoCurve *icu, float *frame, float *val); - -#endif - diff --git a/source/blender/editors/include/BIF_editlattice.h b/source/blender/editors/include/BIF_editlattice.h deleted file mode 100644 index 7b74893c693..00000000000 --- a/source/blender/editors/include/BIF_editlattice.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * $Id: BIF_editlattice.h 3405 2004-11-07 21:14:21Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITLATTICE_H -#define BIF_EDITLATTICE_H - -void free_editLatt(void); -void make_editLatt(void); -void load_editLatt(void); -void remake_editLatt(void); -void deselectall_Latt(void); -void mouse_lattice(void); -void undo_push_lattice(char *name); - -#endif - diff --git a/source/blender/editors/include/BIF_editmesh.h b/source/blender/editors/include/BIF_editmesh.h deleted file mode 100644 index 1a31ae1ee45..00000000000 --- a/source/blender/editors/include/BIF_editmesh.h +++ /dev/null @@ -1,265 +0,0 @@ -/** - * $Id: BIF_editmesh.h 12290 2007-10-18 21:47:55Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -/* External for editmesh_xxxx.c functions */ - -#ifndef BIF_EDITMESH_H -#define BIF_EDITMESH_H - -#include "BKE_mesh.h" - -struct EditMesh; -struct EditFace; -struct EditEdge; -struct EditVert; -struct Mesh; -struct bDeformGroup; -struct View3D; -struct EditSelection; -struct CustomData; - -// edge and face flag both -#define EM_FGON 2 -// face flag -#define EM_FGON_DRAW 1 - -extern unsigned int em_vertoffs, em_solidoffs, em_wireoffs; - -/* ******************* editmesh.c */ -extern void make_editMesh(void); -extern void load_editMesh(void); -extern void free_editMesh(struct EditMesh *); -extern void remake_editMesh(void); - - /* Editmesh Undo code */ -extern void undo_push_mesh(char *name); - -extern void separatemenu(void); -extern void separate_mesh(void); -extern void separate_mesh_loose(void); -extern void separate_material(void); - -/* ******************* editmesh_add.c */ -extern void make_prim(int type, float imat[3][3], int tot, int seg, - int subdiv, float dia, float d, int ext, int fill, - float cent[3] ); -extern void add_primitiveMesh(int type); -extern void adduplicate_mesh(void); -extern void add_click_mesh(void); -extern void addedgeface_mesh(void); -void addfaces_from_edgenet(); - -/* ******************* editmesh_lib.c */ - -extern void EM_set_flag_all(int flag); -extern void EM_clear_flag_all(int flag); - -extern void EM_select_face(struct EditFace *efa, int sel); -extern void EM_select_edge(struct EditEdge *eed, int sel); -extern float EM_face_area(struct EditFace *efa); -extern float EM_face_perimeter(struct EditFace *efa); -extern void EM_editselection_center(float *center, struct EditSelection *ese); -extern void EM_editselection_normal(float *normal, struct EditSelection *ese); -extern void EM_editselection_plane(float *plane, struct EditSelection *ese); - -extern void EM_deselect_flush(void); // vertices to edges/faces (exception!) -extern void EM_select_flush(void); // vertices to edges/faces (exception!) -extern void EM_selectmode_set(void); // when mode changes -extern void EM_selectmode_flush(void); // when selection changes -extern void EM_convertsel(short oldmode, short selectmode); -extern void EM_remove_selection(void *data, int type); -extern void EM_store_selection(void *data, int type); -extern void EM_validate_selections(void); - -extern int EM_nfaces_selected(void); -extern int EM_nvertices_selected(void); - -extern int faceselectedAND(struct EditFace *efa, int flag); -extern void recalc_editnormals(void); -extern void flip_editnormals(void); - -extern void EM_data_interp_from_verts(struct EditVert *v1, - struct EditVert *v2, struct EditVert *eve, float fac); -extern struct EditFace *EM_face_from_faces(struct EditFace *efa1, - struct EditFace *efa2, int i1, int i2, int i3, int i4); -extern void EM_data_interp_from_faces(struct EditFace *efa1, - struct EditFace *efa2, struct EditFace *efan, int i1, int i2, int i3, int i4); - -void EM_add_data_layer(struct CustomData *data, int type); -void EM_free_data_layer(struct CustomData *data, int type); - -/* ******************* editmesh_mods.c */ - -extern void EM_init_index_arrays(int forVert, int forEdge, int forFace); -extern void EM_free_index_arrays(void); - -extern struct EditVert *EM_get_vert_for_index(int index); -extern struct EditEdge *EM_get_edge_for_index(int index); -extern struct EditFace *EM_get_face_for_index(int index); - -extern void EM_select_face_fgon(struct EditFace *efa, int sel); - -extern int EM_init_backbuf_border(short xmin, short ymin, short xmax, short ymax); -extern int EM_mask_init_backbuf_border(short mcords[][2], short tot, short xmin, short ymin, short xmax, short ymax); -extern int EM_init_backbuf_circle(short xs, short ys, short rads); -extern int EM_check_backbuf(unsigned int index); -extern void EM_free_backbuf(void); - -extern void EM_selectmode_menu(void); - - -extern void vertexnoise(void); -extern void vertexsmooth(void); -extern void righthandfaces(int select); -extern void mouse_mesh(void); - -extern void deselectall_mesh(void); -extern void selectconnected_mesh_all(void); -extern void selectconnected_mesh(void); -extern void selectconnected_delimit_mesh(void); -extern void selectconnected_delimit_mesh_all(void); -extern void selectswap_mesh(void); - -extern void hide_mesh(int swap); -extern void reveal_mesh(void); - -extern void vertices_to_sphere(void); - - /** Aligns the selected MTFace's of @a me to the @a v3d, - * using the given axis (0-2). Can give a user error. - */ -extern void faceselect_align_view_to_selected(struct View3D *v3d, struct Mesh *me, int axis); - /** Aligns the selected faces or vertices of @a me to the @a v3d, - * using the given axis (0-2). Can give a user error. - */ -extern void editmesh_align_view_to_selected(struct View3D *v3d, int axis); - - /* Selection */ -extern void select_non_manifold(void); -extern void select_sharp_edges(void); -extern void select_linked_flat_faces(void); -extern void select_faces_by_numverts(int numverts); -extern void select_more(void); -extern void select_less(void); -extern void selectrandom_mesh(void); -extern void editmesh_select_by_material(int index); -extern void editmesh_deselect_by_material(int index); - -extern void Vertex_Menu(void); -extern void Edge_Menu(void); -extern void Face_Menu(void); -extern void select_mesh_group_menu(void); -extern void editmesh_mark_seam(int clear); -extern void loop_multiselect(int looptype); - - -/* ******************* editmesh_loop.c */ - -#define KNIFE_PROMPT 0 -#define KNIFE_EXACT 1 -#define KNIFE_MIDPOINT 2 -#define KNIFE_MULTICUT 3 - -extern void CutEdgeloop(int numcuts); -extern void KnifeSubdivide(char mode); -extern void LoopMenu(void); - -#define LOOP_SELECT 1 -#define LOOP_CUT 2 - -extern short sharesFace(struct EditEdge* e1, struct EditEdge* e2); - -/* ******************* editmesh_tools.c */ - -#define SUBDIV_SELECT_ORIG 0 -#define SUBDIV_SELECT_INNER 1 -#define SUBDIV_SELECT_INNER_SEL 2 -#define SUBDIV_SELECT_LOOPCUT 3 - -extern void convert_to_triface(int direction); -extern int removedoublesflag(short flag, short automerge, float limit); -extern void xsortvert_flag(int flag); -extern void hashvert_flag(int flag); - -extern void esubdivideflag(int flag, float rad, int beauty, int numcuts, int selecttype); - -extern void extrude_mesh(void); -extern void split_mesh(void); -extern void extrude_repeat_mesh(int steps, float offs); -extern void spin_mesh(int steps,float degr,float *dvec, int mode); -extern void screw_mesh(int steps,int turns); -extern void delete_mesh(void); -extern void beauty_fill(void); -extern void join_triangles(void); -extern void edge_flip(void); -extern void fill_mesh(void); -extern void bevel_menu(); -void mesh_set_face_flags(short mode); -extern void mesh_set_smooth_faces(short event); -extern void mesh_rotate_uvs(void); -extern void mesh_mirror_uvs(void); -extern void mesh_rotate_colors(void); -extern void mesh_mirror_colors(void); -void mesh_copy_menu(void); -void edge_rotate_selected(int dir); -int EdgeSlide(short immediate, float imperc); -int EdgeLoopDelete(void); -void mesh_rip(void); - -struct EditVert *editedge_getOtherVert(struct EditEdge *eed, struct EditVert *ev); -struct EditVert *editedge_getSharedVert(struct EditEdge *eed, struct EditEdge *eed2); -int editedge_containsVert(struct EditEdge *eed, struct EditVert *eve); -int editface_containsVert(struct EditFace *efa, struct EditVert *eve); -int editface_containsEdge(struct EditFace *efa, struct EditEdge *eed); - -void shape_copy_select_from(void); -void shape_propagate(void); - -int collapseEdges(void); -int merge_firstlast(int first, int uvmerge); -int merge_target( int target, int uvmerge); - -void pathselect(void); -void loop_to_region(void); -void region_to_loop(void); - -UvVertMap *make_uv_vert_map_EM(int selected, int do_face_idx_array, float *limit); -UvMapVert *get_uv_map_vert_EM(UvVertMap *vmap, unsigned int v); -void free_uv_vert_map_EM(UvVertMap *vmap); - -int EM_texFaceCheck(void); /* can we edit UV's for this mesh?*/ -int EM_vertColorCheck(void); /* can we edit colors for this mesh?*/ - -void EM_set_actFace(struct EditFace *efa); -struct EditFace * EM_get_actFace(void); - -#endif diff --git a/source/blender/editors/include/BIF_editmode_undo.h b/source/blender/editors/include/BIF_editmode_undo.h deleted file mode 100644 index b03b4160166..00000000000 --- a/source/blender/editors/include/BIF_editmode_undo.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * $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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - - -#ifndef BIF_EDITMODE_UNDO_H -#define BIF_EDITMODE_UNDO_H - -// Add this in your local code: - -extern void undo_editmode_push(char *name, - void (*freedata)(void *), // pointer to function freeing data - void (*to_editmode)(void *), // data to editmode conversion - void *(*from_editmode)(void)); // editmode to data conversion - - -// Further exported for UI is: - -struct uiBlock; - -extern void undo_editmode_step(int step); // undo and redo -extern void undo_editmode_clear(void); // free & clear all data -extern void undo_editmode_menu(void); // history menu -extern struct uiBlock *editmode_undohistorymenu(void *arg_unused); - -/* Hack to avoid multires undo data taking up insane amounts of memory */ -struct Object; -void *undo_editmode_get_prev(struct Object *ob); - -#endif - diff --git a/source/blender/editors/include/BIF_editnla.h b/source/blender/editors/include/BIF_editnla.h deleted file mode 100644 index 3f065d8f6a6..00000000000 --- a/source/blender/editors/include/BIF_editnla.h +++ /dev/null @@ -1,65 +0,0 @@ -/** - * $Id: BIF_editnla.h 9722 2007-01-12 02:34:47Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITNLA_H -#define BIF_EDITNLA_H - -struct BWinEvent; - -extern void winqreadnlaspace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); - -/* NLA channel operations */ -void delete_nlachannel_keys(void); -void duplicate_nlachannel_keys(void); -void transform_nlachannel_keys(int mode, int dummy); - -/* Select */ -void borderselect_nla(void); -void deselect_nlachannel_keys (int test); -void deselect_nlachannels(int test); - -/* NLA Strip operations */ -void shift_nlastrips_up(void); -void shift_nlastrips_down(void); -void reset_action_strips(int val); -void synchronize_action_strips(void); -void snap_action_strips(int snap_mode); -void add_nlablock(void); -void add_empty_nlablock(void); -void convert_nla(void); -void copy_action_modifiers(void); - -/* Baking */ -void bake_all_to_action(void); - -#endif - diff --git a/source/blender/editors/include/BIF_editoops.h b/source/blender/editors/include/BIF_editoops.h deleted file mode 100644 index 9f1f8c20ff2..00000000000 --- a/source/blender/editors/include/BIF_editoops.h +++ /dev/null @@ -1,47 +0,0 @@ -/** - * $Id: BIF_editoops.h 4345 2005-04-30 21:19:19Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITOOPS_H -#define BIF_EDITOOPS_H - -void borderselect_oops(void); -void deselect_all_area_oops(void); -void mouse_select_oops(void); -void select_backlinked_oops(void); -void select_linked_oops(void); -void set_select_flag_oops(void); -void swap_select_all_oops(void); -void transform_oops(int mode, int context); - -void clever_numbuts_oops(void); -#endif - diff --git a/source/blender/editors/include/BIF_editparticle.h b/source/blender/editors/include/BIF_editparticle.h deleted file mode 100644 index d4c6a92b8c8..00000000000 --- a/source/blender/editors/include/BIF_editparticle.h +++ /dev/null @@ -1,92 +0,0 @@ -/* BIF_editparticle.h - * - * - * $Id: BIF_editparticle.h $ - * - * ***** 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) 2007 by Janne Karhu. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITPARTICLE_H -#define BIF_EDITPARTICLE_H - -struct Object; -struct ParticleSystem; -struct ParticleEditSettings; - -/* particle edit mode */ -void PE_set_particle_edit(void); -void PE_create_particle_edit(struct Object *ob, struct ParticleSystem *psys); -void PE_free_particle_edit(struct ParticleSystem *psys); - -void PE_change_act(void *ob_v, void *act_v); - -/* access */ -struct ParticleSystem *PE_get_current(struct Object *ob); -short PE_get_current_num(struct Object *ob); -int PE_minmax(float *min, float *max); -void PE_get_colors(char sel[4], char nosel[4]); -struct ParticleEditSettings *PE_settings(void); - -/* update calls */ -void PE_hide_keys_time(struct ParticleSystem *psys, float cfra); -void PE_update_object(struct Object *ob, int useflag); -void PE_update_selection(struct Object *ob, int useflag); -void PE_recalc_world_cos(struct Object *ob, struct ParticleSystem *psys); - -/* selection tools */ -void PE_select_root(void); -void PE_select_tip(void); -void PE_deselectall(void); -void PE_select_linked(void); -void PE_select_less(void); -void PE_select_more(void); - -void PE_mouse_particles(void); -void PE_borderselect(void); -void PE_selectionCB(short selecting, struct Object *editobj, short *mval, float rad); -void PE_do_lasso_select(short mcords[][2], short moves, short select); - -/* tools */ -void PE_hide(int mode); -void PE_rekey(void); -void PE_subdivide(void); -int PE_brush_particles(void); -void PE_delete_particle(void); -void PE_remove_doubles(void); -void PE_mirror_x(int tagged); - -/* undo */ -void PE_undo_push(char *str); -void PE_undo_step(int step); -void PE_undo(void); -void PE_redo(void); -void PE_undo_menu(void); - -#endif - diff --git a/source/blender/editors/include/BIF_editsca.h b/source/blender/editors/include/BIF_editsca.h deleted file mode 100644 index df636621b99..00000000000 --- a/source/blender/editors/include/BIF_editsca.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * $Id: BIF_editsca.h 229 2002-12-27 13:11:01Z mein $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITSCA_H -#define BIF_EDITSCA_H - -void make_unique_prop_names(char *str); -void do_gamebuts(unsigned short event); -void gamebuts(void); - -#endif - diff --git a/source/blender/editors/include/BIF_editseq.h b/source/blender/editors/include/BIF_editseq.h deleted file mode 100644 index dc9722aa2fb..00000000000 --- a/source/blender/editors/include/BIF_editseq.h +++ /dev/null @@ -1,135 +0,0 @@ -/** - * $Id: BIF_editseq.h 12524 2007-11-08 13:02:59Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITSEQ_H -#define BIF_EDITSEQ_H - -struct Sequence; - -void add_duplicate_seq(void); -void add_sequence(int type); -void borderselect_seq(void); -void boundbox_seq(void); -void change_sequence(void); -void reload_sequence(void); -void update_seq_ipo_rect(struct Sequence * seq); -void update_seq_icu_rects(struct Sequence * seq); -struct Sequence* get_last_seq(); -struct Sequence* get_forground_frame_seq( int frame ); -void set_last_seq(struct Sequence * seq); -void clear_last_seq(); -void del_seq(void); -void enter_meta(void); -void exit_meta(void); -struct Sequence* find_neighboring_sequence(struct Sequence *test, int lr, int sel); -struct Sequence* find_next_prev_sequence(struct Sequence *test, int lr, int sel); -struct Sequence* find_nearest_seq(int *hand); -int insert_gap(int gap, int cfra); -void make_meta(void); -void select_channel_direction(struct Sequence *test,int lr); -void select_more_seq(void); -void select_less_seq(void); -void mouse_select_seq(void); -void no_gaps(void); -void seq_snap(short event); -void seq_snap_menu(void); -void set_filter_seq(void); -void swap_select_seq(void); -void touch_seq_files(void); -void seq_remap_paths(void); -void transform_seq(int mode, int context); -void transform_seq_nomarker(int mode, int context); -void un_meta(void); -void seq_cut(int cutframe); -void seq_separate_images(void); -void reassign_inputs_seq_effect(void); -void select_surrounding_handles(struct Sequence *test); -void select_surround_from_last(); -void select_dir_from_last(int lr); -void select_neighbor_from_last(int lr); -void select_linked_seq(int mode); -struct Sequence* alloc_sequence(ListBase *lb, int cfra, int machine); /*used from python*/ -int check_single_seq(struct Sequence *seq); - -/* sequence transform functions, for internal used */ -int seq_tx_get_start(struct Sequence *seq); -int seq_tx_get_end(struct Sequence *seq); - -int seq_tx_get_final_left(struct Sequence *seq); -int seq_tx_get_final_right(struct Sequence *seq); - -void seq_tx_set_final_left(struct Sequence *seq, int i); -void seq_tx_set_final_right(struct Sequence *seq, int i); - -/* check if one side can be transformed */ -int seq_tx_check_left(struct Sequence *seq); -int seq_tx_check_right(struct Sequence *seq); - -#define SEQ_DEBUG_INFO(seq) printf("seq into '%s' -- len:%i start:%i startstill:%i endstill:%i startofs:%i endofs:%i\n",\ - seq->name, seq->len, seq->start, seq->startstill, seq->endstill, seq->startofs, seq->endofs) - -/* seq macro's for transform - notice the difference between start/end and left/right. - - left and right are the bounds at which the setuence is rendered, -start and end are from the start and fixed length of the sequence. -*/ -/* -#define SEQ_GET_START(seq) (seq->start) -#define SEQ_GET_END(seq) (seq->start+seq->len) - -#define SEQ_GET_FINAL_LEFT(seq) ((seq->start - seq->startstill) + seq->startofs) -#define SEQ_GET_FINAL_RIGHT(seq) (((seq->start+seq->len) + seq->endstill) - seq->endofs) - -#define SEQ_SET_FINAL_LEFT(seq, val) \ - if (val < (seq)->start) { \ - (seq)->startstill = abs(val - (seq)->start); \ - (seq)->startofs = 0; \ -} else { \ - (seq)->startofs = abs(val - (seq)->start); \ - (seq)->startstill = 0; \ -} - -#define SEQ_SET_FINAL_RIGHT(seq, val) \ - if (val > (seq)->start + (seq)->len) { \ - (seq)->endstill = abs(val - ((seq)->start + (seq)->len)); \ - (seq)->endofs = 0; \ -} else { \ - (seq)->endofs = abs(val - ((seq)->start + (seq)->len)); \ - (seq)->endstill = 0; \ -} -*/ -/* drawseq.c */ -void do_seqbuttons(short); - -#endif - diff --git a/source/blender/editors/include/BIF_editsima.h b/source/blender/editors/include/BIF_editsima.h deleted file mode 100644 index 530c07a2778..00000000000 --- a/source/blender/editors/include/BIF_editsima.h +++ /dev/null @@ -1,112 +0,0 @@ -/** - * $Id: BIF_editsima.h 12667 2007-11-25 13:43:14Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -struct Mesh; -struct EditMesh; -struct SpaceImage; -struct EditFace; -struct MTFace; - -/* id can be from 0 to 3 */ -#define TF_PIN_MASK(id) (TF_PIN1 << id) -#define TF_SEL_MASK(id) (TF_SEL1 << id) - -struct Object; - -void object_uvs_changed(struct Object *ob); -void object_tface_flags_changed(struct Object *ob, int updateButtons); - -int is_uv_tface_editing_allowed(void); -int is_uv_tface_editing_allowed_silent(void); - -void get_connected_limit_tface_uv(float *limit); -int minmax_tface_uv(float *min, float *max); -int cent_tface_uv(float *cent, int mode); - -void transform_width_height_tface_uv(int *width, int *height); -void transform_aspect_ratio_tface_uv(float *aspx, float *aspy); - -void mouseco_to_cursor_sima(void); -void borderselect_sima(short whichuvs); -void mouseco_to_curtile(void); -void mouse_select_sima(void); -void snap_menu_sima(void); -void aspect_sima(struct SpaceImage *sima, float *x, float *y); - -void select_invert_tface_uv(void); -void select_swap_tface_uv(void); -void mirrormenu_tface_uv(void); -void mirror_tface_uv(char mirroraxis); -void hide_tface_uv(int swap); -void reveal_tface_uv(void); -void stitch_limit_uv_tface(void); -void stitch_vert_uv_tface(void); -void unlink_selection(void); -void uvface_setsel__internal(short select); -void select_linked_tface_uv(int mode); -void pin_tface_uv(int mode); -void weld_align_menu_tface_uv(void); -void weld_align_tface_uv(char tool); -void be_square_tface_uv(struct EditMesh *em); -void select_pinned_tface_uv(void); - -void sima_sample_color(void); - -#define UV_SELECT_ALL 1 -#define UV_SELECT_PINNED 2 - -void new_image_sima(void); -void reload_image_sima(void); -void save_image_sima(void); -void save_as_image_sima(void); -void save_image_sequence_sima(void); -void replace_image_sima(short imageselect); -void open_image_sima(short imageselect); -void pack_image_sima(void); - -/* checks images for forced updates on frame change */ -void BIF_image_update_frame(void); - -void find_nearest_uv(struct MTFace **nearesttf, struct EditFace **nearestefa, unsigned int *nearestv, int *nearestuv); - -/* face selection check functions */ - -int simaFaceDraw_Check_nolocal( struct EditFace *efa ); -int simaFaceDraw_Check( struct EditFace *efa, struct MTFace *tf ); - -int simaFaceSel_Check( struct EditFace *efa, struct MTFace *tf ); -void simaFaceSel_Set( struct EditFace *efa, struct MTFace *tf ); -void simaFaceSel_UnSet( struct EditFace *efa, struct MTFace *tf ); - -int simaUVSel_Check( struct EditFace *efa, struct MTFace *tf, int i); -void simaUVSel_Set( struct EditFace *efa, struct MTFace *tf, int i); -void simaUVSel_UnSet( struct EditFace *efa, struct MTFace *tf, int i); diff --git a/source/blender/editors/include/BIF_editsound.h b/source/blender/editors/include/BIF_editsound.h deleted file mode 100644 index e326409af89..00000000000 --- a/source/blender/editors/include/BIF_editsound.h +++ /dev/null @@ -1,87 +0,0 @@ -/** - * $Id: BIF_editsound.h 12320 2007-10-21 15:42:08Z schlaile $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITSOUND_H -#define BIF_EDITSOUND_H - -struct bSound; -struct bSample; -struct ListBase; -struct PackedFile; -struct hdaudio; - -void sound_init_audio(void); -void sound_initialize_sounds(void); -void sound_exit_audio(void); -int sound_get_mixrate(void); - -void* sound_get_audiodevice(void); -void* sound_get_listener(void); - -int sound_set_sample(struct bSound* sound, struct bSample* sample); -int sound_sample_is_null(struct bSound* sound); -int sound_load_sample(struct bSound* sound); - -struct bSample* sound_find_sample(struct bSound* sound); -struct bSample* sound_new_sample(struct bSound* sound); - -struct bSound* sound_new_sound(char *name); -struct bSound* sound_make_copy(struct bSound* originalsound); -void sound_end_all_sounds(void); - -void sound_initialize_sample(struct bSound * sound); -void sound_load_samples(void); - -void sound_play_sound(struct bSound *sound); -void sound_stop_all_sounds(void); - -void sound_set_position(void *object, - struct bSound *sound, - float obmatrix[4][4]); - -struct hdaudio * sound_open_hdaudio(char * name); -struct hdaudio * sound_copy_hdaudio(struct hdaudio * c); - -long sound_hdaudio_get_duration(struct hdaudio * hdaudio, double frame_rate); -void sound_hdaudio_extract(struct hdaudio * hdaudio, - short * target_buffer, - int sample_position /* units of target_rate */, - int target_rate, - int target_channels, - int nb_samples /* in target */); - -void sound_close_hdaudio(struct hdaudio * hdaudio); - - - -#endif - diff --git a/source/blender/editors/include/BIF_editview.h b/source/blender/editors/include/BIF_editview.h deleted file mode 100644 index 17d7d53ee93..00000000000 --- a/source/blender/editors/include/BIF_editview.h +++ /dev/null @@ -1,61 +0,0 @@ -/** - * $Id: BIF_editview.h 12682 2007-11-26 22:09:57Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITVIEW_H -#define BIF_EDITVIEW_H - -struct Base; -struct Object; -struct Camera; -struct View3D; - -void arrows_move_cursor(unsigned short event); -int lasso_inside(short mcords[][2], short moves, short sx, short sy); -void borderselect(void); -void circle_select(void); -void deselectall(void); -void selectswap(void); -void selectall_type(short obtype); -void selectall_layer(unsigned int layernum); -void draw_sel_circle(short *mval, short *mvalo, float rad, float rado, int selecting); -void fly(void); -int gesture(void); -void mouse_cursor(void); -void mouse_select(void); -void set_active_base(struct Base *base); -void set_active_object(struct Object *ob); -void set_render_border(void); -void view3d_border_zoom(void); -void view3d_edit_clipping(struct View3D *v3d); - -#endif - diff --git a/source/blender/editors/include/BIF_filelist.h b/source/blender/editors/include/BIF_filelist.h deleted file mode 100644 index e2e70054f8b..00000000000 --- a/source/blender/editors/include/BIF_filelist.h +++ /dev/null @@ -1,86 +0,0 @@ -/** - * $Id: BIF_filelist.h 12544 2007-11-10 09:11:42Z elubie $ - * - * ***** 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. - * - * 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) 2007 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BIF_FILELIST_H -#define BIF_FILELIST_H - -#ifdef __cplusplus -extern "C" { -#endif - -struct FileList; -struct direntry; -struct BlendHandle; - -struct FileList * BIF_filelist_new(); -void BIF_filelist_init_icons(); -void BIF_filelist_free_icons(); -struct FileList * BIF_filelist_copy(struct FileList* filelist); -int BIF_filelist_find(struct FileList* filelist, char *file); -void BIF_filelist_free(struct FileList* filelist); -void BIF_filelist_freelib(struct FileList* filelist); -void BIF_filelist_sort(struct FileList* filelist, short sort); -int BIF_filelist_numfiles(struct FileList* filelist); -const char * BIF_filelist_dir(struct FileList* filelist); -void BIF_filelist_setdir(struct FileList* filelist, const char *dir); -struct direntry * BIF_filelist_file(struct FileList* filelist, int index); -void BIF_filelist_hidedot(struct FileList* filelist, short hide); -void BIF_filelist_setfilter(struct FileList* filelist, unsigned int filter); -void BIF_filelist_filter(struct FileList* filelist); -void BIF_filelist_swapselect(struct FileList* filelist); -void BIF_filelist_imgsize(struct FileList* filelist, short w, short h); -void BIF_filelist_loadimage(struct FileList* filelist, int index); -struct ImBuf * BIF_filelist_getimage(struct FileList* filelist, int index); - -void BIF_filelist_readdir(struct FileList* filelist); - -int BIF_filelist_empty(struct FileList* filelist); -void BIF_filelist_parent(struct FileList* filelist); -void BIF_filelist_setfiletypes(struct FileList* filelist, short has_quicktime); -int BIF_filelist_islibrary (struct FileList* filelist, char* dir, char* group); -void BIF_filelist_from_main(struct FileList* filelist); -void BIF_filelist_from_library(struct FileList* filelist); -void BIF_filelist_append_library(struct FileList* filelist, char *dir, char* file, short flag, int idcode); -void BIF_filelist_settype(struct FileList* filelist, int type); -short BIF_filelist_gettype(struct FileList* filelist); -void BIF_filelist_setipotype(struct FileList* filelist, short ipotype); -void BIF_filelist_hasfunc(struct FileList* filelist, int has_func); - -struct BlendHandle *BIF_filelist_lib(struct FileList* filelist); -int BIF_groupname_to_code(char *group); /* TODO: where should this go */ - -#ifdef __cplusplus -} -#endif - -#endif - diff --git a/source/blender/editors/include/BIF_fsmenu.h b/source/blender/editors/include/BIF_fsmenu.h deleted file mode 100644 index 9f1844e34d3..00000000000 --- a/source/blender/editors/include/BIF_fsmenu.h +++ /dev/null @@ -1,76 +0,0 @@ -/** - * $Id: BIF_fsmenu.h 11920 2007-09-02 17:25:03Z elubie $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * - */ - -#ifndef BSE_FSMENU_H -#define BSE_FSMENU_H - - /** Returns the number of entries in the Fileselect Menu */ -int fsmenu_get_nentries (void); - - /** Returns true if the fsmenu entry at @a index exists and - * is a seperator. - */ -int fsmenu_is_entry_a_seperator (int index); - - /** Returns the fsmenu entry at @a index (or NULL if a bad index) - * or a seperator. - */ -char* fsmenu_get_entry (int index); - - /** Returns a new menu description string representing the - * fileselect menu. Should be free'd with MEM_freeN. - */ -char* fsmenu_build_menu (void); - - /** Append a seperator to the FSMenu, inserts always follow the - * last seperator. - */ -void fsmenu_append_separator (void); - - /** Inserts a new fsmenu entry with the given @a path. - * Duplicate entries are not added. - * @param sorted Should entry be inserted in sorted order? - */ -void fsmenu_insert_entry (char *path, int sorted, short save); - - /** Removes the fsmenu entry at the given @a index. */ -void fsmenu_remove_entry (int index); - - /** saves the 'favourites' to the specified file */ -void fsmenu_write_file(const char *filename); - - /** Free's all the memory associated with the fsmenu */ -void fsmenu_free (void); - -#endif - diff --git a/source/blender/editors/include/BIF_graphics.h b/source/blender/editors/include/BIF_graphics.h deleted file mode 100644 index 3cc4098a7c4..00000000000 --- a/source/blender/editors/include/BIF_graphics.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * $Id: BIF_graphics.h 6596 2006-01-29 22:25:53Z broken $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_GRAPHICS_H -#define BIF_GRAPHICS_H - - /* XXX, should move somewhere else, with collected windowing - * stuff, to be done once the proper windowing stuff has - * been formed. - */ - -enum { - CURSOR_VPAINT, - CURSOR_FACESEL, - CURSOR_WAIT, - CURSOR_EDIT, - CURSOR_X_MOVE, - CURSOR_Y_MOVE, - CURSOR_HELP, - CURSOR_STD, - CURSOR_NONE, - CURSOR_PENCIL, - CURSOR_TEXTEDIT -}; - -void set_cursor(int curs); -int get_cursor(void); - -#endif /* BIF_GRAPHICS_H */ - diff --git a/source/blender/editors/include/BIF_imasel.h b/source/blender/editors/include/BIF_imasel.h deleted file mode 100644 index b08f6664e2a..00000000000 --- a/source/blender/editors/include/BIF_imasel.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * $Id: BIF_imasel.h 11920 2007-09-02 17:25:03Z elubie $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ -#ifndef BIF_IMASEL_H -#define BIF_IMASEL_H - -struct SpaceImaSel; -struct ScrArea; - -void free_imasel(struct SpaceImaSel *simasel); - -void clever_numbuts_imasel(void); - -void activate_imageselect(int type, char *title, char *file, void (*func)(char *)); -void activate_imageselect_menu(int type, char *title, char *file, char *pupmenu, short *menup, void (*func)(char *)); -void activate_imageselect_args(int type, char *title, char *file, void (*func)(char *, void *, void *), void *arg1, void *arg2); - -void activate_databrowse_imasel(struct ID *id, int idcode, int fromcode, int retval, short *menup, void (*func)(unsigned short)); -/* -void activate_databrowse_imasel_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2); -*/ -#endif - diff --git a/source/blender/editors/include/BIF_interface.h b/source/blender/editors/include/BIF_interface.h deleted file mode 100644 index d430105ab35..00000000000 --- a/source/blender/editors/include/BIF_interface.h +++ /dev/null @@ -1,331 +0,0 @@ -/** - * $Id: BIF_interface.h 11429 2007-07-30 15:59:16Z pidhash $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_INTERFACE_H -#define BIF_INTERFACE_H - -struct ID; -struct ListBase; -struct ScrArea; -struct AutoComplete; - -/* uiBlock->dt */ -#define UI_EMBOSS 0 /* use one of the themes for drawing */ -#define UI_EMBOSSN 1 /* Nothing */ -#define UI_EMBOSSM 2 /* Minimal builtin emboss, also for logic buttons */ -#define UI_EMBOSSP 3 /* Pulldown */ -#define UI_EMBOSSR 4 /* Rounded */ - -#define UI_EMBOSSX 0 /* for a python file, which i can't change.... duh! */ - -/* uiBlock->direction */ -#define UI_TOP 1 -#define UI_DOWN 2 -#define UI_LEFT 4 -#define UI_RIGHT 8 -#define UI_DIRECTION 15 -#define UI_CENTER 16 -#define UI_SHIFT_FLIPPED 32 - -/* uiBlock->autofill */ -#define UI_BLOCK_COLLUMNS 1 -#define UI_BLOCK_ROWS 2 - -/* return from uiDoBlock */ -#define UI_CONT 0 -#define UI_NOTHING 1 -#define UI_RETURN_CANCEL 2 -#define UI_RETURN_OK 4 -#define UI_RETURN_OUT 8 -#define UI_RETURN 14 -#define UI_EXIT_LOOP 16 - -/* uiBlock->flag (controls) */ -#define UI_BLOCK_LOOP 1 -#define UI_BLOCK_REDRAW 2 -#define UI_BLOCK_RET_1 4 -#define UI_BLOCK_BUSY 8 -#define UI_BLOCK_NUMSELECT 16 -#define UI_BLOCK_ENTER_OK 32 -#define UI_BLOCK_NOSHADOW 64 -#define UI_BLOCK_FRONTBUFFER 128 -#define UI_BLOCK_NO_HILITE 256 - - /* block->flag bits 12-15 are identical to but->flag bits */ - -/* block->font, for now: bold = medium+1 */ -#define UI_HELV 0 -#define UI_HELVB 1 - -/* panel controls */ -#define UI_PNL_TRANSP 1 -#define UI_PNL_SOLID 2 - -#define UI_PNL_CLOSE 32 -#define UI_PNL_STOW 64 -#define UI_PNL_TO_MOUSE 128 -#define UI_PNL_UNSTOW 256 -#define UI_PNL_SCALE 512 - -/* warning the first 4 flags are internal */ -/* but->flag */ -#define UI_TEXT_LEFT 16 -#define UI_ICON_LEFT 32 -#define UI_ICON_RIGHT 64 - /* control for button type block */ -#define UI_MAKE_TOP 128 -#define UI_MAKE_DOWN 256 -#define UI_MAKE_LEFT 512 -#define UI_MAKE_RIGHT 1024 - /* dont draw hilite on mouse over */ -#define UI_NO_HILITE 2048 - /* button align flag, for drawing groups together */ -#define UI_BUT_ALIGN (15<<12) -#define UI_BUT_ALIGN_TOP (1<<12) -#define UI_BUT_ALIGN_LEFT (1<<13) -#define UI_BUT_ALIGN_RIGHT (1<<14) -#define UI_BUT_ALIGN_DOWN (1<<15) - - -/* Button types, bits stored in 1 value... and a short even! -- bits 0-4: bitnr (0-31) -- bits 5-7: pointer type -- bit 8: for 'bit' -- bit 9-15: button type (now 6 bits, 64 types) -*/ - -#define CHA 32 -#define SHO 64 -#define INT 96 -#define FLO 128 -#define FUN 192 -#define BIT 256 - -#define BUTPOIN (128+64+32) - -#define BUT (1<<9) -#define ROW (2<<9) -#define TOG (3<<9) -#define SLI (4<<9) -#define NUM (5<<9) -#define TEX (6<<9) -#define TOG3 (7<<9) -#define TOGR (8<<9) -#define TOGN (9<<9) -#define LABEL (10<<9) -#define MENU (11<<9) -#define ICONROW (12<<9) -#define ICONTOG (13<<9) -#define NUMSLI (14<<9) -#define COL (15<<9) -#define IDPOIN (16<<9) -#define HSVSLI (17<<9) -#define SCROLL (18<<9) -#define BLOCK (19<<9) -#define BUTM (20<<9) -#define SEPR (21<<9) -#define LINK (22<<9) -#define INLINK (23<<9) -#define KEYEVT (24<<9) -#define ICONTEXTROW (25<<9) -#define HSVCUBE (26<<9) -#define PULLDOWN (27<<9) -#define ROUNDBOX (28<<9) -#define CHARTAB (29<<9) -#define BUT_COLORBAND (30<<9) -#define BUT_NORMAL (31<<9) -#define BUT_CURVE (32<<9) -#define BUT_TOGDUAL (33<<9) -#define ICONTOGN (34<<9) -#define FTPREVIEW (35<<9) -#define BUTTYPE (63<<9) - - - -typedef struct uiBut uiBut; -typedef struct uiBlock uiBlock; - -void uiEmboss(float x1, float y1, float x2, float y2, int sel); -void uiRoundBoxEmboss(float minx, float miny, float maxx, float maxy, float rad, int active); -void uiRoundBox(float minx, float miny, float maxx, float maxy, float rad); -void uiSetRoundBox(int type); -void uiRoundRect(float minx, float miny, float maxx, float maxy, float rad); - -void uiDrawMenuBox(float minx, float miny, float maxx, float maxy, short flag); -void uiTextBoundsBlock(uiBlock *block, int addval); -void uiBoundsBlock(struct uiBlock *block, int addval); -void uiDrawBlock(struct uiBlock *block); -void uiGetMouse(int win, short *adr); -void uiComposeLinks(uiBlock *block); -void uiSetButLock(int val, char *lockstr); -void uiClearButLock(void); -int uiDoBlocks(struct ListBase *lb, int event); -void uiSetCurFont(uiBlock *block, int index); -void uiDefFont(unsigned int index, void *xl, void *large, void *medium, void *small); -void uiFreeBlock(uiBlock *block); -void uiFreeBlocks(struct ListBase *lb); -void uiFreeBlocksWin(struct ListBase *lb, int win); -uiBlock *uiNewBlock(struct ListBase *lb, char *name, short dt, short font, short win); -uiBlock *uiGetBlock(char *name, struct ScrArea *sa); - -void uiBlockPickerButtons(struct uiBlock *block, float *col, float *hsv, float *old, char *hexcol, char mode, short retval); - - -/* automatic aligning, horiz or verical */ -void uiBlockBeginAlign(uiBlock *block); -void uiBlockEndAlign(uiBlock *block); - -uiBut *uiDefBut(uiBlock *block, - int type, int retval, char *str, - short x1, short y1, - short x2, short y2, - void *poin, - float min, float max, - float a1, float a2, char *tip); -uiBut *uiDefButF(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButBitF(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButI(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButBitI(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButS(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButBitS(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButC(uiBlock *block, int type, int retval, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefButBitC(uiBlock *block, int type, int bit, int retval, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); - -uiBut *uiDefIconBut(uiBlock *block, - int type, int retval, int icon, - short x1, short y1, - short x2, short y2, - void *poin, - float min, float max, - float a1, float a2, char *tip); -uiBut *uiDefIconButF(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButBitF(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButI(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButBitI(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButS(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButBitS(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButC(uiBlock *block, int type, int retval, int icon, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconButBitC(uiBlock *block, int type, int bit, int retval, int icon, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); - -uiBut *uiDefIconTextBut(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, void *poin, float min, float max, float a1, float a2, char *tip); - -uiBut *uiDefIconTextButF(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButBitF(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, float *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButI(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButBitI(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, int *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButS(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButBitS(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, short *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButC(uiBlock *block, int type, int retval, int icon, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); -uiBut *uiDefIconTextButBitC(uiBlock *block, int type, int bit, int retval, int icon, char *str, short x1, short y1, short x2, short y2, char *poin, float min, float max, float a1, float a2, char *tip); - -typedef void (*uiIDPoinFuncFP) (char *str, struct ID **idpp); -uiBut *uiDefIDPoinBut(struct uiBlock *block, uiIDPoinFuncFP func, short blocktype, int retval, char *str, - short x1, short y1, short x2, short y2, void *idpp, char *tip); - -typedef uiBlock* (*uiBlockFuncFP) (void *arg1); -uiBut *uiDefBlockBut(uiBlock *block, uiBlockFuncFP func, void *func_arg1, char *str, short x1, short y1, short x2, short y2, char *tip); -uiBut *uiDefPulldownBut(uiBlock *block, uiBlockFuncFP func, void *func_arg1, char *str, short x1, short y1, short x2, short y2, char *tip); - -uiBut *uiDefIconTextBlockBut(uiBlock *block, uiBlockFuncFP func, void *arg, int icon, char *str, short x1, short y1, short x2, short y2, char *tip); -uiBut *uiDefIconBlockBut(uiBlock *block, uiBlockFuncFP func, void *arg, int retval, int icon, short x1, short y1, short x2, short y2, char *tip); - -void uiDefKeyevtButS(uiBlock *block, int retval, char *str, short x1, short y1, short x2, short y2, short *spoin, char *tip); - -void uiAutoBlock(struct uiBlock *block, - float minx, float miny, - float sizex, float sizey, int flag); -void uiSetButLink(struct uiBut *but, - void **poin, - void ***ppoin, - short *tot, - int from, int to); - -int uiBlocksGetYMin (ListBase *lb); -int uiBlockGetCol (uiBlock *block); -void* uiBlockGetCurFont (uiBlock *block); - -void uiBlockSetCol (uiBlock *block, int col); -void uiBlockSetEmboss (uiBlock *block, int emboss); -void uiBlockSetDirection (uiBlock *block, int direction); -void uiBlockFlipOrder (uiBlock *block); -void uiBlockSetFlag (uiBlock *block, int flag); -void uiBlockSetXOfs (uiBlock *block, int xofs); - -int uiButGetRetVal (uiBut *but); - -void uiButSetFlag (uiBut *but, int flag); -void uiButClearFlag (uiBut *but, int flag); - -void uiBlockSetButmFunc (uiBlock *block, void (*butmfunc)(void *arg, int but_a2), void *arg); - -void uiBlockSetFunc (uiBlock *block, void (*func)(void *arg1, void *arg2), void *arg1, void *arg2); -void uiButSetFunc (uiBut *but, void (*func)(void *arg1, void *arg2), void *arg1, void *arg2); - -void uiButSetCompleteFunc(uiBut *but, void (*func)(char *str, void *arg), void *arg); - -void uiBlockSetDrawExtraFunc(uiBlock *block, void (*func)(struct ScrArea *sa, uiBlock *block)); - - -extern void pupmenu_set_active(int val); -extern short pupmenu(char *instr); -extern short pupmenu_col(char *instr, int maxrow); - -extern void uiFreePanels(struct ListBase *lb); -extern void uiNewPanelTabbed(char *, char *); -extern int uiNewPanel(struct ScrArea *sa, struct uiBlock *block, char *panelname, char *tabname, int ofsx, int ofsy, int sizex, int sizey); - -extern void uiSetPanel_view2d(struct ScrArea *sa); -extern void uiMatchPanel_view2d(struct ScrArea *sa); - -extern void uiDrawBlocksPanels(struct ScrArea *sa, int re_align); -extern void uiNewPanelHeight(struct uiBlock *block, int sizey); -extern void uiNewPanelTitle(struct uiBlock *block, char *str); -extern void uiPanelPush(struct uiBlock *block); -extern void uiPanelPop(struct uiBlock *block); -extern uiBlock *uiFindOpenPanelBlockName(ListBase *lb, char *name); -extern int uiAlignPanelStep(struct ScrArea *sa, float fac); -extern void uiPanelControl(int); -extern void uiSetPanelHandler(int); - -extern void uiDrawBoxShadow(unsigned char alpha, float minx, float miny, float maxx, float maxy); -extern void *uiSetCurFont_ext(float aspect); - -void shade_buttons_change_3d(void); - -typedef struct AutoComplete AutoComplete; - -AutoComplete *autocomplete_begin(char *startname, int maxlen); -void autocomplete_do_name(AutoComplete *autocpl, const char *name); -void autocomplete_end(AutoComplete *autocpl, char *autoname); - -#endif /* BIF_INTERFACE_H */ - diff --git a/source/blender/editors/include/BIF_interface_icons.h b/source/blender/editors/include/BIF_interface_icons.h deleted file mode 100644 index 63ce89eef62..00000000000 --- a/source/blender/editors/include/BIF_interface_icons.h +++ /dev/null @@ -1,72 +0,0 @@ -/** - * $Id: BIF_interface_icons.h 11920 2007-09-02 17:25:03Z elubie $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_PREVIEW_ICONS_H -#define BIF_PREVIEW_ICONS_H - -struct Image; -struct ImBuf; -struct World; -struct Tex; -struct Lamp; -struct Material; - -typedef struct IconFile { - struct IconFile *next, *prev; - char filename[80]; // FILE_MAXFILE size - int index; -} IconFile; - - -#define ICON_DEFAULT_HEIGHT 16 -#define PREVIEW_DEFAULT_HEIGHT 96 - -/* - Resizable Icons for Blender -*/ -void BIF_icons_init(int first_dyn_id); -int BIF_icon_get_width(int icon_id); -int BIF_icon_get_height(int icon_id); - -void BIF_icon_draw(float x, float y, int icon_id); -void BIF_icon_draw_preview(float x, float y, int icon_id, int nocreate); - -void BIF_icon_draw_aspect(float x, float y, int icon_id, float aspect); -void BIF_icon_draw_aspect_blended(float x, float y, int icon_id, float aspect, int shade); -void BIF_icons_free(); -void BIF_icons_free_drawinfo(void *drawinfo); - -struct ListBase *BIF_iconfile_list(void); -int BIF_iconfile_get_index(char *filename); - - -#endif /* BIF_ICONS_H */ diff --git a/source/blender/editors/include/BIF_keyval.h b/source/blender/editors/include/BIF_keyval.h deleted file mode 100644 index acc34ddfa11..00000000000 --- a/source/blender/editors/include/BIF_keyval.h +++ /dev/null @@ -1,39 +0,0 @@ -/** - * $Id: BIF_keyval.h 229 2002-12-27 13:11:01Z mein $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_KEYVAL_H -#define BIF_KEYVAL_H - -char *key_event_to_string(unsigned short event); - -#endif - diff --git a/source/blender/editors/include/BIF_language.h b/source/blender/editors/include/BIF_language.h deleted file mode 100644 index a1044101bce..00000000000 --- a/source/blender/editors/include/BIF_language.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * $Id: BIF_language.h 11725 2007-08-20 01:02:12Z broken $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_LANGUAGE_H -#define BIF_LANGUAGE_H - -#include "DNA_vec_types.h" - -struct BMF_Font; - -int read_languagefile(void); /* usiblender.c */ -void free_languagemenu(void); /* usiblender.c */ - -void set_interface_font(char *str); /* headerbuttons.c */ -void start_interface_font(void); /* headerbuttons.c */ -void lang_setlanguage(void); /* usiblender.c */ - -char *language_pup(void); -char *fontsize_pup(void); - -int BIF_DrawString(struct BMF_Font* font, char *str, int translate); -float BIF_GetStringWidth(struct BMF_Font* font, char *str, int translate); -void BIF_GetBoundingBox(struct BMF_Font* font, char* str, int translate, rctf* bbox); - -void BIF_RasterPos(float x, float y); -void BIF_SetScale(float aspect); -void refresh_interface_font(void); - -struct LANGMenuEntry { - struct LANGMenuEntry *next; - char *line; - char *language; - char *code; - int id; -}; - -struct LANGMenuEntry *find_language(short langid); - -#endif /* BIF_LANGUAGE_H */ - diff --git a/source/blender/editors/include/BIF_mainqueue.h b/source/blender/editors/include/BIF_mainqueue.h deleted file mode 100644 index 3d87a32119d..00000000000 --- a/source/blender/editors/include/BIF_mainqueue.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Central queue handling functions. - * - * $Id: BIF_mainqueue.h 9981 2007-01-31 11:24:13Z artificer $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_MAINQUEUE_H -#define BIF_MAINQUEUE_H - -#define MAXQUEUE 4096 - -unsigned short mainqtest (void); -unsigned short mainqread (short *val, char *ascii); -void mainqenter (unsigned short event, short val); -void mainqenter_ext (unsigned short event, short val, char ascii); -void mainqpushback (unsigned short event, short val, char ascii); - -#endif /* BIF_MAINQUEUE_H */ - diff --git a/source/blender/editors/include/BIF_meshlaplacian.h b/source/blender/editors/include/BIF_meshlaplacian.h deleted file mode 100644 index 74e4fef0937..00000000000 --- a/source/blender/editors/include/BIF_meshlaplacian.h +++ /dev/null @@ -1,87 +0,0 @@ -/** - * $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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * BIF_meshlaplacian.h: Algorithms using the mesh laplacian. - */ - -#ifndef BIF_MESHLAPLACIAN_H -#define BIF_MESHLAPLACIAN_H - -//#define RIGID_DEFORM - -struct Object; -struct Mesh; -struct bDeformGroup; -struct MeshDeformModifierData; - -#ifdef RIGID_DEFORM -struct EditMesh; -#endif - -/* Laplacian System */ - -struct LaplacianSystem; -typedef struct LaplacianSystem LaplacianSystem; - -LaplacianSystem *laplacian_construct_begin(int totvert, int totface); - -void laplacian_add_vertex(LaplacianSystem *sys, float *co, int pinned); -void laplacian_add_triangle(LaplacianSystem *sys, int v1, int v2, int v3); - -void laplacian_construct_end(LaplacianSystem *sys); -void laplacian_delete(LaplacianSystem *sys); - -void laplacian_begin_solve(LaplacianSystem *sys, int index); -void laplacian_add_right_hand_side(LaplacianSystem *sys, int v, float value); -int laplacian_system_solve(LaplacianSystem *sys); -float laplacian_system_get_solution(int v); - -/* Heat Weighting */ - -void heat_bone_weighting(struct Object *ob, struct Mesh *me, float (*verts)[3], - int numbones, struct bDeformGroup **dgrouplist, - struct bDeformGroup **dgroupflip, float (*root)[3], float (*tip)[3], - int *selected); - -#ifdef RIGID_DEFORM -/* As-Rigid-As-Possible Deformation */ - -void rigid_deform_begin(struct EditMesh *em); -void rigid_deform_iteration(void); -void rigid_deform_end(int cancel); -#endif - -/* Harmonic Coordinates */ - -void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd, - float (*vertexcos)[3], int totvert, float cagemat[][4]); - -#endif - diff --git a/source/blender/editors/include/BIF_meshtools.h b/source/blender/editors/include/BIF_meshtools.h deleted file mode 100644 index 17bbb2393ef..00000000000 --- a/source/blender/editors/include/BIF_meshtools.h +++ /dev/null @@ -1,51 +0,0 @@ -/** - * $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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_MESHTOOLS_H -#define BIF_MESHTOOLS_H - -struct Object; -struct EditVert; - -extern int join_mesh(void); - -extern void sort_faces(void); -extern void objects_bake_render_menu(void); -extern void objects_bake_render(short event); - -extern long mesh_octree_table(struct Object *ob, float *co, char mode); -extern int mesh_get_x_mirror_vert(struct Object *ob, int index); -extern struct EditVert *editmesh_get_x_mirror_vert(struct Object *ob, float *co); -extern int *mesh_get_x_mirror_faces(struct Object *ob); - -#endif - diff --git a/source/blender/editors/include/BIF_mywindow.h b/source/blender/editors/include/BIF_mywindow.h deleted file mode 100644 index 56976edaba0..00000000000 --- a/source/blender/editors/include/BIF_mywindow.h +++ /dev/null @@ -1,145 +0,0 @@ - -/** - * $Id: BIF_mywindow.h 10466 2007-04-05 12:42:07Z broken $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * These are the protos for mywindow.c -- an emulation of the - * (obsolete) IrisGL command set - */ - -#ifndef BIF_MYWINDOW_H -#define BIF_MYWINDOW_H - -struct rcti; - -/*---*/ - -typedef struct BWinEvent { - unsigned short event; - short val; - char ascii; -} BWinEvent; - -/*---*/ - -int mywinget(void); -void mywinclose(int winid); -void mywinposition(int winid, - int xmin, int xmax, - int ymin, int ymax); -/*---*/ - - /** Test if there are events available on a BWin queue. - * - * @param winid The ID of the window to query. - * @return True if there is an event available for _qread'ing. - */ -int bwin_qtest(int winid); - - /** Read an event off of the BWin queue (if available). - * - * @param winid The ID of the window to read from. - * @param event_r A pointer to return the event in. - * @return True if an event was read and @a event_r filled. - */ -int bwin_qread(int winid, BWinEvent *event_r); - - /** Add an event to the BWin queue. - * - * @param winid The ID of the window to add to. - * @param event A pointer to copy the event from. - */ -void bwin_qadd(int winid, BWinEvent *event); - -/*---*/ - -void bwin_load_viewmatrix(int winid, float mat[][4]); -void bwin_load_winmatrix(int winid, float mat[][4]); - -void bwin_get_viewmatrix(int winid, float mat[][4]); -void bwin_get_winmatrix(int winid, float mat[][4]); - -void bwin_multmatrix(int winid, float mat[][4]); -void bwin_scalematrix(int winid, float x, float y, float z); - -void bwin_ortho(int winid, float x1, float x2, float y1, float y2, float n, float f); -void bwin_ortho2(int win, float x1, float x2, float y1, float y2); -void bwin_frustum(int winid, float x1, float x2, float y1, float y2, float n, float f); - -void bwin_getsize(int winid, int *x, int *y); -void bwin_getsuborigin(int winid, int *x, int *y); -void bwin_get_rect(int winid, struct rcti *rect_r); -void bwin_getsinglematrix(int winid, float mat[][4]); -void bwin_clear_viewmat(int winid); - -int myswinopen(int parentid, int xmin, int xmax, int ymin, int ymax); -int myswinopen_allowed(void); -void myswapbuffers(void); - -void mygetmatrix(float mat[][4]); -void mymultmatrix(float [][4]); - -void myloadmatrix(float mat[][4]); -void mywinset(int wid); -void myortho(float x1, float x2, float y1, float y2, float n, float f); -void myortho2(float x1, float x2, float y1, float y2); -void mywindow(float x1, float x2, float y1, float y2, float n, float f); -void mygetsingmatrix(float (*)[4]); - -void setlinestyle(int nr); - -void BIF_wait_for_statechange(void); - -#define L_MOUSE 1 -#define M_MOUSE 2 -#define R_MOUSE 4 -short get_mbut(void); -short get_qual(void); -void getmouse(short *mval); - -float get_pressure(void); -void get_tilt(float *xtilt, float *ytilt); -#define DEV_MOUSE 0 -#define DEV_STYLUS 1 -#define DEV_ERASER 2 -short get_activedevice(void); - -void warp_pointer(int x, int y); - -int framebuffer_to_index(unsigned int col); -void set_framebuffer_index_color(int index); - -int mywin_inmenu(void); -void mywin_getmenu_rect(int *x, int *y, int *sx, int *sy); - -void my_put_frontbuffer_image(void); -void my_get_frontbuffer_image(int x, int y, int sx, int sy); - -#endif - diff --git a/source/blender/editors/include/BIF_oops.h b/source/blender/editors/include/BIF_oops.h deleted file mode 100644 index 4de725f3021..00000000000 --- a/source/blender/editors/include/BIF_oops.h +++ /dev/null @@ -1,71 +0,0 @@ -/** - * $Id: BIF_oops.h 3919 2005-03-09 19:45:59Z lukep $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_OOPS_H -#define BIF_OOPS_H - -struct Curve; -struct Oops; -struct OopsLink; -struct SpaceOops; -struct Material; -struct Mesh; -struct MetaBall; -struct Object; -struct Lamp; -void add_curve_oopslinks(struct Curve *cu, struct Oops *oops, short flag); -void add_from_link(struct Oops *from, struct Oops *oops); -void add_material_oopslinks(struct Material *ma, struct Oops *oops, short flag); -void add_mball_oopslinks(struct MetaBall *mb, struct Oops *oops, short flag); -void add_mesh_oopslinks(struct Mesh *me, struct Oops *oops, short flag); -void add_object_oopslinks(struct Object *ob, struct Oops *oops, short flag); -void add_lamp_oopslinks(struct Lamp *la, struct Oops *oops, short flag); -struct Oops *add_oops(void *id); -struct OopsLink *add_oopslink(char *name, struct Oops *oops, short type, void *from, float xof, float yof); -struct Oops *add_test_oops(void *id); /* incl links */ -void add_texture_oops(struct Material *ma); -void build_oops(void); -struct Oops *find_oops(ID *id); -void free_oops(struct Oops *oops); /* ook oops zelf */ -void free_oopspace(struct SpaceOops *so); -void new_oops_location(struct Oops *); -int oops_test_overlap(struct Oops *test); -int oops_test_overlaphide(struct Oops *test); -float oopslink_totlen(struct Oops *oops); -void shrink_oops(void); -void shuffle_oops(void); -int test_oops(struct Oops *oops); -void test_oopslink(struct OopsLink *ol); -void test_oopslinko(struct OopsLink *ol); - -#endif - diff --git a/source/blender/editors/include/BIF_outliner.h b/source/blender/editors/include/BIF_outliner.h deleted file mode 100644 index 34ed7950421..00000000000 --- a/source/blender/editors/include/BIF_outliner.h +++ /dev/null @@ -1,106 +0,0 @@ -/** - * $Id: BIF_outliner.h - * - * ***** 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) 2004 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_OUTLINER_H -#define BIF_OUTLINER_H - -struct TreeStoreElem; - -typedef struct TreeElement { - struct TreeElement *next, *prev, *parent; - ListBase subtree; - float xs, ys; // do selection - int store_index; // offset in tree store - short flag, index; // flag for non-saved stuff, index for data arrays - short idcode; // from TreeStore id - short xend; // width of item display, for select - char *name; - void *directdata; // Armature Bones, Base, ... -} TreeElement; - -/* TreeElement->flag */ -#define TE_ACTIVE 1 -#define TE_ICONROW 2 - -/* TreeStoreElem types */ -#define TSE_NLA 1 -#define TSE_NLA_ACTION 2 -#define TSE_DEFGROUP_BASE 3 -#define TSE_DEFGROUP 4 -#define TSE_BONE 5 -#define TSE_EBONE 6 -#define TSE_CONSTRAINT_BASE 7 -#define TSE_CONSTRAINT 8 -#define TSE_MODIFIER_BASE 9 -#define TSE_MODIFIER 10 -#define TSE_LINKED_OB 11 -#define TSE_SCRIPT_BASE 12 -#define TSE_POSE_BASE 13 -#define TSE_POSE_CHANNEL 14 -/*#ifdef WITH_VERSE*/ -#define TSE_VERSE_SESSION 15 -#define TSE_VERSE_OBJ_NODE 16 -#define TSE_VERSE_GEOM_NODE 17 -/*#endif*/ -#define TSE_PROXY 18 -#define TSE_R_LAYER_BASE 19 -#define TSE_R_LAYER 20 -#define TSE_R_PASS 21 -#define TSE_LINKED_MAT 22 - /* NOTE, is used for light group */ -#define TSE_LINKED_LAMP 23 - -/* outliner search flags */ -#define OL_FIND 0 -#define OL_FIND_CASE 1 -#define OL_FIND_COMPLETE 2 -#define OL_FIND_COMPLETE_CASE 3 - -/* button events */ -#define OL_NAMEBUTTON 1 - -extern void draw_outliner(struct ScrArea *sa, struct SpaceOops *so); -extern void outliner_free_tree(struct ListBase *lb); -extern void outliner_mouse_event(struct ScrArea *sa, short event); -extern void outliner_toggle_visible(struct ScrArea *sa); -extern void outliner_show_active(struct ScrArea *sa); -extern void outliner_show_hierarchy(struct ScrArea *sa); -extern void outliner_one_level(struct ScrArea *sa, int add); -extern void outliner_select(struct ScrArea *sa); -extern void outliner_toggle_selected(struct ScrArea *sa); -extern void outliner_del(struct ScrArea *sa); -extern void outliner_operation_menu(struct ScrArea *sa); -extern void outliner_page_up_down(struct ScrArea *sa, int up); -extern void outliner_find_panel(struct ScrArea *sa, int again, int flags); - -#endif - diff --git a/source/blender/editors/include/BIF_poseobject.h b/source/blender/editors/include/BIF_poseobject.h deleted file mode 100644 index b427646bffe..00000000000 --- a/source/blender/editors/include/BIF_poseobject.h +++ /dev/null @@ -1,71 +0,0 @@ -/** - * $Id: BIF_poseobject.h 11403 2007-07-28 14:04:02Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_POSEOBJECT -#define BIF_POSEOBJECT - - -struct Object; -struct bPoseChannel; - -void enter_posemode(void); -void exit_posemode(void); - - // sets chan->flag to POSE_KEY if bone selected -void set_pose_keys(struct Object *ob); - -struct bPoseChannel *get_active_posechannel (struct Object *ob); -int pose_channel_in_IK_chain(struct Object *ob, struct bPoseChannel *pchan); - -/* tools */ -void pose_select_constraint_target(void); -void pose_special_editmenu(void); -void pose_add_IK(void); -void pose_clear_IK(void); -void pose_clear_constraints(void); -void pose_copy_menu(void); - -void free_posebuf(void); -void copy_posebuf (void); -void paste_posebuf (int flip); - -void pose_adds_vgroups(struct Object *meshobj, int heatweights); - -void pose_calculate_path(struct Object *ob); -void pose_clear_paths(struct Object *ob); - -void pose_flip_names(void); -void pose_activate_flipped_bone(void); -void pose_movetolayer(void); - -#endif - diff --git a/source/blender/editors/include/BIF_previewrender.h b/source/blender/editors/include/BIF_previewrender.h deleted file mode 100644 index 0482ee29ebc..00000000000 --- a/source/blender/editors/include/BIF_previewrender.h +++ /dev/null @@ -1,94 +0,0 @@ -/** - * $Id: BIF_previewrender.h 8761 2006-11-06 01:08:26Z nicholasbishop $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_PREVIEWRENDER_H -#define BIF_PREVIEWRENDER_H - -#include "DNA_vec_types.h" - -struct View3D; -struct SpaceButs; -struct RenderInfo; -struct Image; -struct ScrArea; -struct uiBlock; -struct Render; - -#define PREVIEW_RENDERSIZE 140 - -typedef void (*VectorDrawFunc)(int x, int y, int w, int h, float alpha); - -/* stores rendered preview - is also used for icons */ -typedef struct RenderInfo { - int pr_rectx; - int pr_recty; - short curtile, tottile, status; - rcti disprect; /* storage for view3d preview rect */ - unsigned int* rect; - struct Render *re; /* persistant render */ -} RenderInfo; - -/* ri->status */ -#define PR_DBASE 1 -#define PR_DISPRECT 2 -#define PR_PROJECTED 4 -#define PR_ROTATED 8 - -/* Render the preview - -pr_method: -- PR_DRAW_RENDER: preview is rendered and drawn, as indicated by called context (buttons panel) -- PR_ICON_RENDER: the preview is not drawn and the function is not dynamic, - so no events are processed. Hopefully fast enough for at least 32x32 -- PR_DO_RENDER: preview is rendered, not drawn, but events are processed for afterqueue, - in use for node editor now. -*/ - -#define PR_DRAW_RENDER 0 -#define PR_ICON_RENDER 1 -#define PR_DO_RENDER 2 - -void BIF_previewrender (struct ID *id, struct RenderInfo *ri, struct ScrArea *area, int pr_method); -void BIF_previewrender_buts (struct SpaceButs *sbuts); -void BIF_previewdraw (struct ScrArea *sa, struct uiBlock *block); -void BIF_preview_changed (short id_code); - -void BIF_preview_init_dbase (void); -void BIF_preview_free_dbase (void); - -void BIF_view3d_previewrender(struct ScrArea *sa); -void BIF_view3d_previewdraw (struct ScrArea *sa, struct uiBlock *block); -void BIF_view3d_previewrender_free(struct View3D *v3d); -void BIF_view3d_previewrender_clear(struct ScrArea *sa); -void BIF_view3d_previewrender_signal(struct ScrArea *sa, short signal); - -#endif diff --git a/source/blender/editors/include/BIF_renderwin.h b/source/blender/editors/include/BIF_renderwin.h deleted file mode 100644 index f73ce53f8dc..00000000000 --- a/source/blender/editors/include/BIF_renderwin.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * $Id: BIF_renderwin.h 9376 2006-12-20 17:57:56Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -struct Render; -struct ScrArea; -struct RenderStats; - -void calc_renderwin_rectangle(int rectx, int recty, int posmask, int renderpos_r[2], int rendersize_r[2]); - -void BIF_close_render_display(void); - -void BIF_do_render(int anim); - -/** - * @param v3d The View3D space to render. - */ -void BIF_do_ogl_render(struct View3D *v3d, int anim); - -void BIF_renderwin_set_for_ogl_render(void); -void BIF_renderwin_set_custom_cursor(unsigned char mask[16][2], unsigned char bitmap[16][2]); - -void BIF_redraw_render_rect(void); -void BIF_swap_render_rects(void); -void BIF_store_spare(void); -void BIF_toggle_render_display(void); - -void BIF_init_render_callbacks(struct Render *re, int do_display); -void BIF_end_render_callbacks(void); - -/* should not be here, ~WIP~ */ -void make_renderinfo_string(struct RenderStats *rs, char *str); - -/* space for info text */ -#define RW_HEADERY 18 - -/* header print for window */ -#define RW_MAXTEXT 512 - diff --git a/source/blender/editors/include/BIF_resources.h b/source/blender/editors/include/BIF_resources.h deleted file mode 100644 index 96d4cb58f53..00000000000 --- a/source/blender/editors/include/BIF_resources.h +++ /dev/null @@ -1,600 +0,0 @@ -/** - * $Id: BIF_resources.h 12755 2007-12-02 05:50:38Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_RESOURCES_H -#define BIF_RESOURCES_H - -/* elubie: TODO: move the typedef for icons to BIF_interface_icons.h */ -/* and add/replace include of BIF_resources.h by BIF_interface_icons.h */ -typedef enum { -#define BIFICONID_FIRST (ICON_VIEW3D) - ICON_VIEW3D, - ICON_IPO, - ICON_OOPS, - ICON_BUTS, - ICON_FILESEL, - ICON_IMAGE_COL, - ICON_INFO, - ICON_SEQUENCE, - ICON_TEXT, - ICON_IMASEL, - ICON_SOUND, - ICON_ACTION, - ICON_NLA, - ICON_SCRIPTWIN, - ICON_TIME, - ICON_NODE, - ICON_SPACE2, - ICON_SPACE3, - ICON_SPACE4, - ICON_TRIA_LEFT, - ICON_TRIA_UP, - ICON_FONTPREVIEW, - ICON_BLANK4, - ICON_BLANK5, - ICON_BLANK6, - - ICON_ORTHO, - ICON_PERSP, - ICON_CAMERA, - ICON_PARTICLES, - ICON_BBOX, - ICON_WIRE, - ICON_SOLID, - ICON_SMOOTH, - ICON_POTATO, - ICON_MARKER_HLT, - ICON_NORMALVIEW, - ICON_LOCALVIEW, - ICON_UNUSEDVIEW, - ICON_VIEWZOOM, - ICON_SORTALPHA, - ICON_SORTTIME, - ICON_SORTSIZE, - ICON_LONGDISPLAY, - ICON_SHORTDISPLAY, - ICON_TRIA_DOWN, - ICON_TRIA_RIGHT, - ICON_BLANK7, - ICON_BLANK8, - ICON_BLANK9, - ICON_BLANK10, - - ICON_VIEW_AXIS_ALL, - ICON_VIEW_AXIS_NONE, - ICON_VIEW_AXIS_NONE2, - ICON_VIEW_AXIS_TOP, - ICON_VIEW_AXIS_FRONT, - ICON_VIEW_AXIS_SIDE, - ICON_POSE_DEHLT, - ICON_POSE_HLT, - ICON_BORDERMOVE, - ICON_MAYBE_ITS_A_LASSO, - ICON_BLANK1, /* ATTENTION, someone decided to use this throughout blender - and didn't care to neither rename it nor update the PNG */ - ICON_VERSE, - ICON_MOD_BOOLEAN, - ICON_ARMATURE, - ICON_PAUSE, - ICON_ALIGN, - ICON_REC, - ICON_PLAY, - ICON_FF, - ICON_REW, - ICON_PYTHON, - ICON_BLANK11, - ICON_BLANK12, - ICON_BLANK13, - ICON_BLANK14, - - - ICON_DOTSUP, - ICON_DOTSDOWN, - ICON_MENU_PANEL, - ICON_AXIS_SIDE, - ICON_AXIS_FRONT, - ICON_AXIS_TOP, - ICON_STICKY_UVS_LOC, - ICON_STICKY_UVS_DISABLE, - ICON_STICKY_UVS_VERT, - ICON_PREV_KEYFRAME, - ICON_NEXT_KEYFRAME, - ICON_ENVMAP, - ICON_TRANSP_HLT, - ICON_TRANSP_DEHLT, - ICON_CIRCLE_DEHLT, - ICON_CIRCLE_HLT, - ICON_TPAINT_DEHLT, - ICON_TPAINT_HLT, - ICON_WPAINT_DEHLT, - ICON_WPAINT_HLT, - ICON_MARKER, - ICON_BLANK15, - ICON_BLANK16, - ICON_BLANK17, - ICON_BLANK18, - - ICON_X, - ICON_GO_LEFT, - ICON_NO_GO_LEFT, - ICON_UNLOCKED, - ICON_LOCKED, - ICON_PARLIB, - ICON_DATALIB, - ICON_AUTO, - ICON_MATERIAL_DEHLT2, - ICON_RING, - ICON_GRID, - ICON_PROPEDIT, - ICON_KEEPRECT, - ICON_DESEL_CUBE_VERTS, - ICON_EDITMODE_DEHLT, - ICON_EDITMODE_HLT, - ICON_VPAINT_DEHLT, - ICON_VPAINT_HLT, - ICON_FACESEL_DEHLT, - ICON_FACESEL_HLT, - ICON_EDIT_DEHLT, - ICON_BOOKMARKS, - ICON_BLANK20, - ICON_BLANK21, - ICON_BLANK22, - - ICON_HELP, - ICON_ERROR, - ICON_FOLDER_DEHLT, - ICON_FOLDER_HLT, - ICON_BLUEIMAGE_DEHLT, - ICON_BLUEIMAGE_HLT, - ICON_BPIBFOLDER_DEHLT, - ICON_BPIBFOLDER_HLT, - ICON_BPIBFOLDER_ERR, - ICON_UGLY_GREEN_RING, - ICON_GHOST, - ICON_SORTBYEXT, - ICON_SCULPTMODE_HLT, - ICON_VERTEXSEL, - ICON_EDGESEL, - ICON_FACESEL, - ICON_PLUS, - ICON_BPIBFOLDER_X, - ICON_BPIBFOLDERGREY, - ICON_MAGNIFY, - ICON_INFO2, - ICON_BLANK23, - ICON_BLANK24, - ICON_BLANK25, - ICON_BLANK26, - - ICON_RIGHTARROW, - ICON_DOWNARROW_HLT, - ICON_ROUNDBEVELTHING, - ICON_FULLTEXTURE, - ICON_HOOK, - ICON_DOT, - ICON_WORLD_DEHLT, - ICON_CHECKBOX_DEHLT, - ICON_CHECKBOX_HLT, - ICON_LINK, - ICON_INLINK, - ICON_ZOOMIN, - ICON_ZOOMOUT, - ICON_PASTEDOWN, - ICON_COPYDOWN, - ICON_CONSTANT, - ICON_LINEAR, - ICON_CYCLIC, - ICON_KEY_DEHLT, - ICON_KEY_HLT, - ICON_GRID2, - ICON_BLANK27, - ICON_BLANK28, - ICON_BLANK29, - ICON_BLANK30, - - ICON_EYE, - ICON_LAMP, - ICON_MATERIAL, - ICON_TEXTURE, - ICON_ANIM, - ICON_WORLD, - ICON_SCENE, - ICON_EDIT, - ICON_GAME, - ICON_PAINT, - ICON_RADIO, - ICON_SCRIPT, - ICON_SPEAKER, - ICON_PASTEUP, - ICON_COPYUP, - ICON_PASTEFLIPUP, - ICON_PASTEFLIPDOWN, - ICON_CYCLICLINEAR, - ICON_PIN_DEHLT, - ICON_PIN_HLT, - ICON_LITTLEGRID, - ICON_BLANK31, - ICON_BLANK32, - ICON_BLANK33, - ICON_BLANK34, - - ICON_FULLSCREEN, - ICON_SPLITSCREEN, - ICON_RIGHTARROW_THIN, - ICON_DISCLOSURE_TRI_RIGHT, - ICON_DISCLOSURE_TRI_DOWN, - ICON_SCENE_SEPIA, - ICON_SCENE_DEHLT, - ICON_OBJECT, - ICON_MESH, - ICON_CURVE, - ICON_MBALL, - ICON_LATTICE, - ICON_LAMP_DEHLT, - ICON_MATERIAL_DEHLT, - ICON_TEXTURE_DEHLT, - ICON_IPO_DEHLT, - ICON_LIBRARY_DEHLT, - ICON_IMAGE_DEHLT, - ICON_EYEDROPPER, - ICON_WINDOW_WINDOW, - ICON_PANEL_CLOSE, - ICON_PHYSICS, - ICON_BLANK36, - ICON_BLANK37, - ICON_BLANK38, - - ICON_BLENDER, - ICON_PACKAGE, - ICON_UGLYPACKAGE, - ICON_MATPLANE, - ICON_MATSPHERE, - ICON_MATCUBE, - ICON_SCENE_HLT, - ICON_OBJECT_HLT, - ICON_MESH_HLT, - ICON_CURVE_HLT, - ICON_MBALL_HLT, - ICON_LATTICE_HLT, - ICON_LAMP_HLT, - ICON_MATERIAL_HLT, - ICON_TEXTURE_HLT, - ICON_IPO_HLT, - ICON_LIBRARY_HLT, - ICON_IMAGE_HLT, - ICON_CONSTRAINT, - ICON_CAMERA_DEHLT, - ICON_ARMATURE_DEHLT, - ICON_SNAP_GEAR, - ICON_SNAP_GEO, - ICON_BLANK41, - ICON_BLANK42, - - ICON_SMOOTHCURVE, - ICON_SPHERECURVE, - ICON_ROOTCURVE, - ICON_SHARPCURVE, - ICON_LINCURVE, - ICON_NOCURVE, - ICON_RNDCURVE, - ICON_PROP_OFF, - ICON_PROP_ON, - ICON_PROP_CON, - ICON_SYNTAX, - ICON_SYNTAX_OFF, - ICON_MONKEY, - ICON_HAIR, - ICON_VIEWMOVE, - ICON_HOME, - ICON_CLIPUV_DEHLT, - ICON_CLIPUV_HLT, - ICON_BLANK2, - ICON_BLANK3, - ICON_VPAINT_COL, - ICON_RESTRICT_SELECT_OFF, - ICON_RESTRICT_SELECT_ON, - ICON_MUTE_IPO_OFF, - ICON_MUTE_IPO_ON, - - ICON_MAN_TRANS, - ICON_MAN_ROT, - ICON_MAN_SCALE, - ICON_MANIPUL, - ICON_BLANK_47, - ICON_MODIFIER, - ICON_MOD_WAVE, - ICON_MOD_BUILD, - ICON_MOD_DECIM, - ICON_MOD_MIRROR, - ICON_MOD_SOFT, - ICON_MOD_SUBSURF, - ICON_SEQ_SEQUENCER, - ICON_SEQ_PREVIEW, - ICON_SEQ_LUMA_WAVEFORM, - ICON_SEQ_CHROMA_SCOPE, - ICON_ROTATE, - ICON_CURSOR, - ICON_ROTATECOLLECTION, - ICON_ROTATECENTER, - ICON_ROTACTIVE, - ICON_RESTRICT_VIEW_OFF, - ICON_RESTRICT_VIEW_ON, - ICON_RESTRICT_RENDER_OFF, - ICON_RESTRICT_RENDER_ON, - - VICON_VIEW3D, - VICON_EDIT, - VICON_EDITMODE_DEHLT, - VICON_EDITMODE_HLT, - VICON_DISCLOSURE_TRI_RIGHT, - VICON_DISCLOSURE_TRI_DOWN, - VICON_MOVE_UP, - VICON_MOVE_DOWN, - VICON_X - -#define BIFICONID_LAST (VICON_X) -#define BIFNICONIDS (BIFICONID_LAST-BIFICONID_FIRST + 1) -} BIFIconID; - -typedef enum { -#define BIFCOLORSHADE_FIRST (COLORSHADE_DARK) - COLORSHADE_DARK, - COLORSHADE_GREY, - COLORSHADE_MEDIUM, - COLORSHADE_HILITE, - COLORSHADE_LIGHT, - COLORSHADE_WHITE -#define BIFCOLORSHADE_LAST (COLORSHADE_WHITE) -#define BIFNCOLORSHADES (BIFCOLORSHADE_LAST-BIFCOLORSHADE_FIRST + 1) -} BIFColorShade; - -typedef enum { -#define BIFCOLORID_FIRST (BUTGREY) - BUTGREY = 0, - BUTGREEN, - BUTBLUE, - BUTSALMON, - MIDGREY, - BUTPURPLE, - BUTYELLOW, - REDALERT, - BUTRUST, - BUTWHITE, - BUTDBLUE, - BUTPINK, - BUTDPINK, - BUTMACTIVE, - - BUTIPO, - BUTAUDIO, - BUTCAMERA, - BUTRANDOM, - BUTEDITOBJECT, - BUTPROPERTY, - BUTSCENE, - BUTMOTION, - BUTMESSAGE, - BUTACTION, - BUTCD, - BUTGAME, - BUTVISIBILITY, - BUTYUCK, - BUTSEASICK, - BUTCHOKE, - BUTIMPERIAL, - - BUTTEXTCOLOR, - BUTTEXTPRESSED, - BUTSBACKGROUND, - - VIEWPORTBACKCOLOR, - VIEWPORTGRIDCOLOR, - VIEWPORTACTIVECOLOR, - VIEWPORTSELECTEDCOLOR, - VIEWPORTUNSELCOLOR, - - EDITVERTSEL, - EDITVERTUNSEL, - EDITEDGESEL, - EDITEDGEUNSEL - -#define BIFCOLORID_LAST (EDITEDGEUNSEL) -#define BIFNCOLORIDS (BIFCOLORID_LAST-BIFCOLORID_FIRST + 1) - -} BIFColorID; - -/* XXX WARNING: this is saved in file, so do not change order! */ -enum { - TH_AUTO, /* for buttons, to signal automatic color assignment */ - -// uibutton colors - TH_BUT_OUTLINE, - TH_BUT_NEUTRAL, - TH_BUT_ACTION, - TH_BUT_SETTING, - TH_BUT_SETTING1, - TH_BUT_SETTING2, - TH_BUT_NUM, - TH_BUT_TEXTFIELD, - TH_BUT_POPUP, - TH_BUT_TEXT, - TH_BUT_TEXT_HI, - TH_MENU_BACK, - TH_MENU_ITEM, - TH_MENU_HILITE, - TH_MENU_TEXT, - TH_MENU_TEXT_HI, - - TH_BUT_DRAWTYPE, - - TH_REDALERT, - TH_CUSTOM, - - TH_BUT_TEXTFIELD_HI, - TH_ICONFILE, - - TH_THEMEUI, -// common colors among spaces - - TH_BACK, - TH_TEXT, - TH_TEXT_HI, - TH_HEADER, - TH_HEADERDESEL, - TH_PANEL, - TH_SHADE1, - TH_SHADE2, - TH_HILITE, - - TH_GRID, - TH_WIRE, - TH_SELECT, - TH_ACTIVE, - TH_GROUP, - TH_GROUP_ACTIVE, - TH_TRANSFORM, - TH_VERTEX, - TH_VERTEX_SELECT, - TH_VERTEX_SIZE, - TH_EDGE, - TH_EDGE_SELECT, - TH_EDGE_SEAM, - TH_EDGE_FACESEL, - TH_FACE, - TH_FACE_SELECT, - TH_NORMAL, - TH_FACE_DOT, - TH_FACEDOT_SIZE, - TH_CFRAME, - - TH_SYNTAX_B, - TH_SYNTAX_V, - TH_SYNTAX_C, - TH_SYNTAX_L, - TH_SYNTAX_N, - - TH_BONE_SOLID, - TH_BONE_POSE, - - TH_STRIP, - TH_STRIP_SELECT, - - TH_LAMP, - - TH_NODE, - TH_NODE_IN_OUT, - TH_NODE_OPERATOR, - TH_NODE_CONVERTOR, - TH_NODE_GROUP, - - TH_SEQ_MOVIE, - TH_SEQ_IMAGE, - TH_SEQ_SCENE, - TH_SEQ_AUDIO, - TH_SEQ_EFFECT, - TH_SEQ_PLUGIN, - TH_SEQ_TRANSITION, - TH_SEQ_META, - - TH_EDGE_SHARP, - TH_EDITMESH_ACTIVE, -}; -/* XXX WARNING: previous is saved in file, so do not change order! */ - -/* theme drawtypes */ -#define TH_MINIMAL 0 -#define TH_SHADED 1 -#define TH_ROUNDED 2 -#define TH_OLDSKOOL 3 - -/* specific defines per space should have higher define values */ - -struct bTheme; - -// THE CODERS API FOR THEMES: - -// sets the color -void BIF_ThemeColor(int colorid); - -// sets the color plus alpha -void BIF_ThemeColor4(int colorid); - -// sets color plus offset for shade -void BIF_ThemeColorShade(int colorid, int offset); - -// sets color plus offset for alpha -void BIF_ThemeColorShadeAlpha(int colorid, int coloffset, int alphaoffset); - -// sets color, which is blend between two theme colors -void BIF_ThemeColorBlend(int colorid1, int colorid2, float fac); -// same, with shade offset -void BIF_ThemeColorBlendShade(int colorid1, int colorid2, float fac, int offset); - -// returns one value, not scaled -float BIF_GetThemeValuef(int colorid); -int BIF_GetThemeValue(int colorid); - -// get three color values, scaled to 0.0-1.0 range -void BIF_GetThemeColor3fv(int colorid, float *col); - -// get the 3 or 4 byte values -void BIF_GetThemeColor3ubv(int colorid, char *col); -void BIF_GetThemeColor4ubv(int colorid, char *col); - -// get a theme color from specified space type -void BIF_GetThemeColorType4ubv(int colorid, int spacetype, char *col); - -// blends and shades between two color pointers -void BIF_ColorPtrBlendShade3ubv(char *cp1, char *cp2, float fac, int offset); - -// get a 3 byte color, blended and shaded between two other char color pointers -void BIF_GetColorPtrBlendShade3ubv(char *cp1, char *cp2, char *col, float fac, int offset); - - -struct ScrArea; - -// internal (blender) usage only, for init and set active -void BIF_InitTheme(void); -void BIF_SetTheme(struct ScrArea *sa); -void BIF_resources_init (void); -void BIF_resources_free (void); -void BIF_colors_init (void); -void BIF_load_ui_colors (void); - -/* only for buttons in theme editor! */ -char *BIF_ThemeGetColorPtr(struct bTheme *btheme, int spacetype, int colorid); -char *BIF_ThemeColorsPup(int spacetype); - - -void BIF_def_color (BIFColorID colorid, unsigned char r, unsigned char g, unsigned char b); - -#endif /* BIF_ICONS_H */ diff --git a/source/blender/editors/include/BIF_retopo.h b/source/blender/editors/include/BIF_retopo.h deleted file mode 100644 index 5cf9b512fc5..00000000000 --- a/source/blender/editors/include/BIF_retopo.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - * $Id: BIF_retopo.h 9804 2007-01-17 03:57:01Z nicholasbishop $ - * - * ***** 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) 2006 by Nicholas Bishop - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ - -#ifndef BIF_RETOPO_H -#define BIF_RETOPO_H - -#include "DNA_vec_types.h" - -/* For bglMats */ -#include "BIF_glutil.h" - -struct EditVert; -struct Mesh; -struct View3D; - -typedef struct RetopoViewData { - bglMats mats; - - char queue_matrix_update; -} RetopoViewData; - -typedef struct RetopoPaintPoint { - struct RetopoPaintPoint *next, *prev; - vec2s loc; - short index; - float co[3]; - struct EditVert *eve; -} RetopoPaintPoint; - -typedef struct RetopoPaintLine { - struct RetopoPaintLine *next, *prev; - ListBase points; - ListBase hitlist; /* RetopoPaintHit */ - RetopoPaintPoint *cyclic; -} RetopoPaintLine; - -typedef struct RetopoPaintSel { - struct RetopoPaintSel *next, *prev; - RetopoPaintLine *line; - char first; -} RetopoPaintSel; - -typedef struct RetopoPaintData { - char in_drag; - short sloc[2]; - - ListBase lines; - ListBase intersections; /* RetopoPaintPoint */ - - short seldist; - RetopoPaintSel nearest; - - struct View3D *paint_v3d; -} RetopoPaintData; - -RetopoPaintData *get_retopo_paint_data(); - -char retopo_mesh_check(); -char retopo_curve_check(); - -void retopo_end_okee(); - -void retopo_free_paint_data(RetopoPaintData *rpd); -void retopo_free_paint(); - -char retopo_mesh_paint_check(); -void retopo_paint_view_update(struct View3D *v3d); -void retopo_force_update(); -void retopo_paint_toggle(void*,void*); -char retopo_paint(const unsigned short event); -void retopo_draw_paint_lines(); -RetopoPaintData *retopo_paint_data_copy(RetopoPaintData *rpd); - -void retopo_toggle(void*,void*); -void retopo_do_vert(struct View3D *v3d, float *v); -void retopo_do_all(); -void retopo_do_all_cb(void *, void *); -void retopo_queue_updates(struct View3D *v3d); - -void retopo_matrix_update(struct View3D *v3d); - -void retopo_free_view_data(struct View3D *v3d); - -#endif diff --git a/source/blender/editors/include/BIF_scrarea.h b/source/blender/editors/include/BIF_scrarea.h deleted file mode 100644 index d71fb38c7a2..00000000000 --- a/source/blender/editors/include/BIF_scrarea.h +++ /dev/null @@ -1,54 +0,0 @@ -/** - * $Id: BIF_scrarea.h 229 2002-12-27 13:11:01Z mein $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifdef __cplusplus -extern "C" { -#endif - -struct ScrArea; - - /** - * Finds the first spacedata of @a type within - * the scrarea. - */ -void *scrarea_find_space_of_type(ScrArea *sa, int type); - -int scrarea_get_win_x (struct ScrArea *sa); -int scrarea_get_win_y (struct ScrArea *sa); -int scrarea_get_win_width (struct ScrArea *sa); -int scrarea_get_win_height (struct ScrArea *sa); - -#ifdef __cplusplus -} - -#endif - diff --git a/source/blender/editors/include/BIF_screen.h b/source/blender/editors/include/BIF_screen.h deleted file mode 100644 index e221fcace1e..00000000000 --- a/source/blender/editors/include/BIF_screen.h +++ /dev/null @@ -1,137 +0,0 @@ -/* replacement for screen.h */ -/* - * - * Leftovers here are actually editscreen.c thingies - * - * $Id: BIF_screen.h 10543 2007-04-17 18:15:31Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_SCREEN_H -#define BIF_SCREEN_H - -#ifdef __cplusplus -extern "C" { -#endif - - -/* externs in editscreen.c */ -extern int displaysizex, displaysizey; -extern struct ScrArea *curarea; - -struct View3D; -struct bScreen; -struct ScrArea; -struct ScrVert; -struct ScrEdge; -struct ListBase; - -struct View3D *find_biggest_view3d(void); -struct ScrArea *find_biggest_area_of_type(int spacecode); -struct ScrArea *find_biggest_area(void); - -void scrarea_queue_redraw(struct ScrArea *area); -void scrarea_queue_winredraw(struct ScrArea *area); -void scrarea_queue_headredraw(struct ScrArea *area); - -int blender_test_break(void); - -void duplicate_screen(void); -void init_screen_cursors(void); -void set_timecursor(int nr); -void waitcursor(int val); -void wich_cursor(struct ScrArea *sa); -void setcursor_space(int spacetype, short cur); -void set_g_activearea(struct ScrArea *sa); -void getmouseco_sc(short *mval); -void getmouseco_areawin(short *mval); -void getmouseco_headwin(short *mval); -int qtest(void); -int anyqtest(void); -void areawinset(short win); -void headerbox(struct ScrArea *sa); -void defheaddraw(void); -void defheadchange(void); -unsigned short winqtest(struct ScrArea *sa); -unsigned short headqtest(struct ScrArea *sa); -void winqdelete(struct ScrArea *sa); -void winqclear(struct ScrArea *sa); -void addqueue(short win, unsigned short event, short val); -void addafterqueue(short win, unsigned short event, short val); -void add_readfile_event(char *filename); -short ext_qtest(void); -unsigned short extern_qread(short *val); -unsigned short extern_qread_ext(short *val, char *ascii); - -extern void markdirty_all(void); // also sets redraw event -extern void markdirty_all_back(void); -extern void markdirty_win_back(short winid); - -void screen_swapbuffers(void); -void set_debug_swapbuffers_ovveride(struct bScreen *sc, int mode); -int is_allowed_to_change_screen(struct bScreen *newp); -void splash(void * data, int datasizei, char * string); -void screen_delayed_undo_push(char *name); -void screenmain(void); -void getdisplaysize(void); -void setprefsize(int stax, int stay, int sizx, int sizy, int maximized); -void calc_arearcts(struct ScrArea *sa); -void resize_screen(int x, int y, int w, int h); -struct ScrArea *closest_bigger_area(void); -int mywinopen(int mode, short posx, short posy, short sizex, short sizey); -void setscreen(struct bScreen *sc); -void area_fullscreen(void); -int select_area(int spacetype); -struct bScreen *default_twosplit(void); -void initscreen(void); -void unlink_screen(struct bScreen *sc); -void reset_autosave(void); -int area_is_active_area(struct ScrArea *area); -void draw_area_emboss(struct ScrArea *sa); - -void headerprint(char *str); - -/* ******* handlers ****** */ -void add_screenhandler(struct bScreen *sc, short eventcode, short val); -void rem_screenhandler(struct bScreen *sc, short eventcode); -int do_screenhandlers(struct bScreen *sc); -int has_screenhandler(struct bScreen *sc, short eventcode); - - /***/ - -/* return all layers of all 3d windows in a screen */ -unsigned int screen_view3d_layers(void); - -#ifdef __cplusplus -} -#endif - -#endif /* BIF_SCREEN_H */ - diff --git a/source/blender/editors/include/BIF_space.h b/source/blender/editors/include/BIF_space.h deleted file mode 100644 index 2e91568437b..00000000000 --- a/source/blender/editors/include/BIF_space.h +++ /dev/null @@ -1,148 +0,0 @@ -/** - * $Id: BIF_space.h 12177 2007-10-01 08:03:11Z schlaile $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_SPACE_H -#define BIF_SPACE_H - -struct ListBase; -struct ScrArea; -struct SpaceButs; -struct View2D; -struct BWinEvent; -struct SpaceOops; - -#define REMAKEIPO 1 -#define OOPS_TEST 2 - -#define BUT_HORIZONTAL 1 -#define BUT_VERTICAL 2 - -/* is hardcoded in DNA_space_types.h */ -#define SPACE_MAXHANDLER 8 - -/* view3d handler codes */ -#define VIEW3D_HANDLER_BACKGROUND 1 -#define VIEW3D_HANDLER_PROPERTIES 2 -#define VIEW3D_HANDLER_OBJECT 3 -#define VIEW3D_HANDLER_PREVIEW 4 -#define VIEW3D_HANDLER_MULTIRES 5 - -/* ipo handler codes */ -#define IPO_HANDLER_PROPERTIES 20 - -/* image handler codes */ -#define IMAGE_HANDLER_PROPERTIES 30 -#define IMAGE_HANDLER_PAINT 31 -#define IMAGE_HANDLER_CURVES 32 -#define IMAGE_HANDLER_PREVIEW 33 -#define IMAGE_HANDLER_GAME_PROPERTIES 34 -#define IMAGE_HANDLER_VIEW_PROPERTIES 35 -/*#define IMAGE_HANDLER_TRANSFORM_PROPERTIES 36*/ - -/* action handler codes */ -#define ACTION_HANDLER_PROPERTIES 40 - -/* nla handler codes */ -#define NLA_HANDLER_PROPERTIES 50 - -/* sequence handler codes */ -#define SEQ_HANDLER_PROPERTIES 60 - -/* imasel handler codes */ -#define IMASEL_HANDLER_IMAGE 70 - -/* theme codes */ -#define B_ADD_THEME 3301 -#define B_DEL_THEME 3302 -#define B_NAME_THEME 3303 -#define B_THEMECOL 3304 -#define B_UPDATE_THEME 3305 -#define B_CHANGE_THEME 3306 -#define B_THEME_COPY 3307 -#define B_THEME_PASTE 3308 -#define B_UPDATE_THEME_ICONS 3309 - -#define B_RECALCLIGHT 3310 - - -void scrarea_do_winprefetchdraw (struct ScrArea *sa); -void scrarea_do_windraw (struct ScrArea *sa); -void scrarea_do_winchange (struct ScrArea *sa); -void scrarea_do_winhandle (struct ScrArea *sa, struct BWinEvent *evt); -void scrarea_do_headdraw (struct ScrArea *sa); -void scrarea_do_headchange (struct ScrArea *sa); - -/* space.c */ -extern void add_blockhandler(struct ScrArea *sa, short eventcode, short action); -extern void rem_blockhandler(struct ScrArea *sa, short eventcode); -extern void toggle_blockhandler(struct ScrArea *sa, short eventcode, short action); - -extern void space_set_commmandline_options(void); -extern void allqueue(unsigned short event, short val); -extern void allspace(unsigned short event, short val); -extern void copy_view3d_lock(short val); -extern void drawemptyspace(struct ScrArea *sa, void *spacedata); -extern void drawinfospace(struct ScrArea *sa, void *spacedata); -extern void duplicatespacelist(struct ScrArea *area, struct ListBase *lb1, struct ListBase *lb2); -extern void extern_set_butspace(int fkey, int do_cycle); -extern void force_draw(int header); -extern void force_draw_all(int header); -extern void force_draw_plus(int type, int header); -extern void freespacelist(struct ScrArea *sa); -extern void handle_view3d_around(void); -extern void handle_view3d_lock(void); -extern void init_v2d_oops(struct ScrArea *, struct SpaceOops *); -extern void initipo(struct ScrArea *sa); -extern void newspace(struct ScrArea *sa, int type); -extern void set_rects_butspace(struct SpaceButs *buts); -extern void test_butspace(void); -extern void start_game(void); -extern void select_object_grouped(short nr); -extern void join_menu(void); - -extern void BIF_undo_push(char *str); -extern void BIF_undo(void); -extern void BIF_redo(void); -extern void BIF_undo_menu(void); - -#if 0 -//#ifdef _WIN32 // FULLSCREEN -extern void mainwindow_toggle_fullscreen(int fullscreen); -#endif - -extern void mainwindow_set_filename_to_title(char *title); -extern void mainwindow_raise(void); -extern void mainwindow_make_active(void); -extern void mainwindow_close(void); - -#endif - diff --git a/source/blender/editors/include/BIF_spacetypes.h b/source/blender/editors/include/BIF_spacetypes.h deleted file mode 100644 index eb4608f91cf..00000000000 --- a/source/blender/editors/include/BIF_spacetypes.h +++ /dev/null @@ -1,67 +0,0 @@ -/** - * $Id: BIF_spacetypes.h 12177 2007-10-01 08:03:11Z schlaile $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -struct ScrArea; -struct BWinEvent; - -typedef struct _SpaceType SpaceType; - -typedef void (*SpacePrefetchDrawFP) (struct ScrArea *sa, void *spacedata); -typedef void (*SpaceDrawFP) (struct ScrArea *sa, void *spacedata); -typedef void (*SpaceChangeFP) (struct ScrArea *sa, void *spacedata); -typedef void (*SpaceHandleFP) (struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); - - /***/ - -SpaceType* spacetype_new (char *name); - -void spacetype_set_winfuncs (SpaceType *st, SpacePrefetchDrawFP prefetch, SpaceDrawFP draw, SpaceChangeFP change, SpaceHandleFP handle); - - /***/ - -SpaceType *spaceaction_get_type (void); -SpaceType *spacebuts_get_type (void); -SpaceType *spacefile_get_type (void); -SpaceType *spaceimage_get_type (void); -SpaceType *spaceimasel_get_type (void); -SpaceType *spaceinfo_get_type (void); -SpaceType *spaceipo_get_type (void); -SpaceType *spacenla_get_type (void); -SpaceType *spaceoops_get_type (void); -SpaceType *spaceseq_get_type (void); -SpaceType *spacesound_get_type (void); -SpaceType *spacetext_get_type (void); -SpaceType *spacescript_get_type (void); -SpaceType *spaceview3d_get_type (void); -SpaceType *spacetime_get_type (void); -SpaceType *spacenode_get_type (void); - diff --git a/source/blender/editors/include/BIF_tbcallback.h b/source/blender/editors/include/BIF_tbcallback.h deleted file mode 100644 index 4e92b3c32b0..00000000000 --- a/source/blender/editors/include/BIF_tbcallback.h +++ /dev/null @@ -1,42 +0,0 @@ -/* $Id: BIF_tbcallback.h 206 2002-12-20 09:41:25Z mein $ -*/ -/* - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK *****/ - -/* defines callback structure for toolbox menu */ -typedef struct _TBcallback { - char *desc; - char *key; - void (*cb)(int v); /* callback function takes value */ - int val; -} TBcallback; - -typedef TBcallback * (*Tbox_callbackfunc)(int l, int x); -void tboxSetCallback(Tbox_callbackfunc f); - diff --git a/source/blender/editors/include/BIF_toets.h b/source/blender/editors/include/BIF_toets.h deleted file mode 100644 index 2885d325a27..00000000000 --- a/source/blender/editors/include/BIF_toets.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * $Id: BIF_toets.h 6568 2006-01-28 18:33:28Z hos $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_TOETS_H -#define BIF_TOETS_H - -int blenderqread(unsigned short event, short val); -void persptoetsen(unsigned short event); /* dutch rules man */ -int untitled(char *name); - -#endif - diff --git a/source/blender/editors/include/BIF_toolbox.h b/source/blender/editors/include/BIF_toolbox.h deleted file mode 100644 index 46e81719aec..00000000000 --- a/source/blender/editors/include/BIF_toolbox.h +++ /dev/null @@ -1,68 +0,0 @@ -/* toolbox (SPACEKEY) related - * $Id: BIF_toolbox.h 10571 2007-04-22 22:08:19Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_TOOLBOX_H -#define BIF_TOOLBOX_H - -/* toolbox.c */ -void asciitoraw (int ch, short unsigned int *event, short unsigned int *qual); - -void toolbox_n(void); -void toolbox_n_add(void); -void reset_toolbox(void); - -void notice (char *str, ...); -void error (char *fmt, ...); - -void error_libdata (void); - -int saveover (char *filename); -int okee (char *fmt, ...); - -short button (short *var, short min, short max, char *str); -short fbutton (float *var, float min, float max, float a1, float a2, char *str); -short sbutton (char *var, float min, float max, char *str); /* __NLA */ - -int movetolayer_buts (unsigned int *lay, char *title); -int movetolayer_short_buts (short *lay, char *title); - -void draw_numbuts_tip (char *str, int x1, int y1, int x2, int y2); -int do_clever_numbuts (char *name, int tot, int winevent); -void clever_numbuts_buts(void); -void add_numbut (int nr, int type, char *str, float min, float max, void *poin, char *tip); -void clever_numbuts (void); -void replace_names_but (void); - -void BIF_screendump(int fscreen); -void write_screendump(char *name); - -#endif diff --git a/source/blender/editors/include/BIF_transform.h b/source/blender/editors/include/BIF_transform.h deleted file mode 100644 index 9c8798a54ee..00000000000 --- a/source/blender/editors/include/BIF_transform.h +++ /dev/null @@ -1,110 +0,0 @@ -/** - * $Id: BIF_transform.h 12682 2007-11-26 22:09:57Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_TRANSFORM_H -#define BIF_TRANSFORM_H - -/* ******************** Macros & Prototypes *********************** */ - -/* MODE AND NUMINPUT FLAGS */ -#define TFM_INIT -1 -#define TFM_DUMMY 0 -#define TFM_TRANSLATION 1 -#define TFM_ROTATION 2 -#define TFM_RESIZE 3 -#define TFM_TOSPHERE 4 -#define TFM_SHEAR 5 -#define TFM_WARP 7 -#define TFM_SHRINKFATTEN 8 -#define TFM_TILT 9 -#define TFM_LAMP_ENERGY 10 -#define TFM_TRACKBALL 11 -#define TFM_PUSHPULL 12 -#define TFM_CREASE 13 -#define TFM_MIRROR 14 -#define TFM_BONESIZE 15 -#define TFM_BONE_ENVELOPE 16 -#define TFM_CURVE_SHRINKFATTEN 17 -#define TFM_BONE_ROLL 18 -#define TFM_TIME_TRANSLATE 19 -#define TFM_TIME_SLIDE 20 -#define TFM_TIME_SCALE 21 -#define TFM_TIME_EXTEND 22 -#define TFM_BAKE_TIME 23 - -/* TRANSFORM CONTEXTS */ -#define CTX_NONE 0 -#define CTX_TEXTURE 1 -#define CTX_EDGE 2 -#define CTX_NO_PET 4 -#define CTX_TWEAK 8 -#define CTX_NO_MIRROR 16 - -void initTransform(int mode, int context); -void Transform(void); -void Mirror(short mode); - -/* Standalone call to get the transformation center corresponding to the current situation - * returns 1 if successful, 0 otherwise (usually means there's no selection) - * (if 0 is returns, *vec is unmodified) - * */ -int calculateTransformCenter(int centerMode, float *vec); - -struct TransInfo; -struct ScrArea; - -struct TransInfo * BIF_GetTransInfo(void); -void BIF_setSingleAxisConstraint(float vec[3], char *text); -void BIF_setDualAxisConstraint(float vec1[3], float vec2[3], char *text); -void BIF_setLocalAxisConstraint(char axis, char *text); -void BIF_setLocalLockConstraint(char axis, char *text); - -/* Drawing callbacks */ -void BIF_drawConstraint(void); -void BIF_drawPropCircle(void); -void BIF_drawSnap(void); - -void BIF_getPropCenter(float *center); - -void BIF_TransformSetUndo(char *str); - -void BIF_selectOrientation(void); - -/* view3d manipulators */ -void initManipulator(int mode); -void ManipulatorTransform(); - -int BIF_do_manipulator(struct ScrArea *sa); -void BIF_draw_manipulator(struct ScrArea *sa); - -#endif - diff --git a/source/blender/editors/include/BIF_usiblender.h b/source/blender/editors/include/BIF_usiblender.h deleted file mode 100644 index bdc12053861..00000000000 --- a/source/blender/editors/include/BIF_usiblender.h +++ /dev/null @@ -1,54 +0,0 @@ -/** - * $Id: BIF_usiblender.h 12552 2007-11-11 15:18:53Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_USIBLENDER_H -#define BIF_USIBLENDER_H - -typedef struct RecentFile { - struct RecentFile *next, *prev; - char *filename; -} RecentFile; - -void exit_usiblender(void); - -void BIF_init(void); - -void BIF_read_file(char *name); -int BIF_read_homefile(int from_memory); -void BIF_read_autosavefile(void); - -void BIF_write_file(char *target); -void BIF_write_homefile(void); -void BIF_write_autosave(void); - -#endif - diff --git a/source/blender/editors/include/BIF_verse.h b/source/blender/editors/include/BIF_verse.h deleted file mode 100644 index be4f73ccd54..00000000000 --- a/source/blender/editors/include/BIF_verse.h +++ /dev/null @@ -1,142 +0,0 @@ -/** - * $Id: BIF_verse.h 9683 2007-01-09 11:50:45Z jiri $ - * - * ***** 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. - * - * Contributor(s): Jiri Hnidek. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifdef WITH_VERSE - -#ifndef BIF_VERSE_H -#define BIF_VERSE_H - -#include "BKE_verse.h" -#include "DNA_meshdata_types.h" - -struct Object; - -struct EditMesh; -struct EditVert; -struct EditFace; -struct Mesh; -struct MVert; -struct Mface; - -/* verse_object.c */ -void unsubscribe_from_obj_node(struct VNode *vnode); -void unsubscribe_from_geom_node(struct VNode *vnode); -void unsubscribe_from_bitmap_node(struct VNode *vnode); - -void test_and_send_idbutton_cb(void *obj, void *ob_name); - -struct Object *create_object_from_verse_node(struct VNode *vnode); - -void b_verse_pop_node(struct VNode *vnode); -void b_verse_unsubscribe(VNode *vnode); -void b_verse_push_object(struct VerseSession *session, struct Object *ob); -void b_verse_delete_object(struct Object *ob); -void b_verse_ms_get(void); - -void post_transform_pos(struct VNode *vnode); -void post_transform_rot(struct VNode *vnode); -void post_transform_scale(struct VNode *vnode); - -/*void post_transform(struct VNode *vnode);*/ -void post_link_set(struct VLink *vlink); -void post_link_destroy(struct VLink *vlink); -void post_object_free_constraint(struct VNode *vnode); - -void b_verse_send_transformation(struct Object *ob); - -/* verse_mesh.c */ -void b_verse_send_vertex_delete(struct EditVert *eve); -void send_versevert_pos(struct VerseVert *vvert); - -void b_verse_send_face_delete(struct EditFace *efa); - -void sync_all_versefaces_with_editfaces(struct VNode *vnode); -void sync_all_verseverts_with_editverts(struct VNode *vnode); - -void createVerseVert(struct EditVert *ev); -void createVerseFace(struct EditFace *efa); - -void b_verse_duplicate_object(struct VerseSession *session, struct Object *ob, struct Object *n_ob); -struct VNode *create_geom_vnode_from_geom_vnode(struct VNode *vnode); -struct VNode *create_geom_vnode_data_from_editmesh(struct VerseSession *session, struct EditMesh *em); -struct VNode *create_geom_vnode_data_from_mesh(struct VerseSession *session, struct Mesh *me); - -void destroy_unused_geometry(struct VNode *vnode); -void destroy_binding_between_versemesh_and_editmesh(struct VNode *vnode); - -void destroy_versemesh(struct VNode *vnode); - -void unsubscribe_from_geom_node(struct VNode *vnode); - -void create_edit_mesh_from_geom_node(struct VNode *vnode); -struct Mesh *create_mesh_from_geom_node(struct VNode *vnode); -void create_meshdata_from_geom_node(struct Mesh *me, struct VNode *vnode); - -/* geometry post callback functions */ -void post_layer_create(struct VLayer *vlayer); -void post_layer_destroy(struct VLayer *vlayer); - -void post_vertex_create(struct VerseVert *vvert); -void post_vertex_set_xyz(struct VerseVert *vvert); -void post_vertex_delete(struct VerseVert *vvert); -void post_vertex_free_constraint(struct VerseVert *vvert); - -void post_polygon_set_uint8(struct VerseFace *vface); -void post_polygon_create(struct VerseFace *vface); -void post_polygon_set_corner(struct VerseFace *vface); -void post_polygon_delete(struct VerseFace *vface); -void post_polygon_free_constraint(struct VerseFace *vface); - -void post_geometry_free_constraint(struct VNode *vnode); - -/* verse_common.c */ -struct VerseSession *session_menu(void); -char *verse_client_name(void); - -void post_tag_change(struct VTag *vtag); -void post_taggroup_create(struct VTagGroup *vtaggroup); - -void post_node_create(struct VNode *vnode); -void post_node_destroy(struct VNode *vnode); -void post_node_name_set(struct VNode *vnode); - -void post_connect_accept(struct VerseSession *session); -void post_connect_terminated(struct VerseSession *session); -void post_connect_update(struct VerseSession *session); -void post_server_add(void); - -/* verse_image.c */ - -void sync_blender_image_with_verse_bitmap_node(struct VNode *vnode); -void post_bitmap_dimension_set(struct VNode *vnode); -void post_bitmap_layer_create(struct VBitmapLayer *vblayer); -void post_bitmap_layer_destroy(struct VBitmapLayer *vblayer); -void post_bitmap_tile_set(struct VBitmapLayer *vblayer, unsigned int xs, unsigned int ys); - -#endif - -#endif diff --git a/source/blender/editors/include/BIF_writeavicodec.h b/source/blender/editors/include/BIF_writeavicodec.h deleted file mode 100644 index 842c2eade1a..00000000000 --- a/source/blender/editors/include/BIF_writeavicodec.h +++ /dev/null @@ -1,44 +0,0 @@ -/** - * Functions for writing windows avi-format files. - * - * $Id: BIF_writeavicodec.h 6589 2006-01-29 17:46:19Z bjornmose $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * - */ - -#ifdef _WIN32 - -void start_avi_codec(RenderData *rd,int rectx, int recty ); -void append_avi_codec(int frame,int *pixels,int rectx, int recty); -void end_avi_codec(void); -int get_avicodec_settings(void); - -#endif - diff --git a/source/blender/editors/include/BIF_writeimage.h b/source/blender/editors/include/BIF_writeimage.h deleted file mode 100644 index 0a71da0ba50..00000000000 --- a/source/blender/editors/include/BIF_writeimage.h +++ /dev/null @@ -1,45 +0,0 @@ -/** - * $Id: BIF_writeimage.h 9376 2006-12-20 17:57:56Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_WRITEIMAGE_H -#define BIF_WRITEIMAGE_H - -struct ImBuf; -struct EnvMap; - -void BIF_save_rendered_image(char *name); -void BIF_save_rendered_image_fs(void); -void BIF_save_envmap(struct EnvMap *env, char *str); -void save_image_filesel_str(char *str); - -#endif - diff --git a/source/blender/editors/include/BIF_writemovie.h b/source/blender/editors/include/BIF_writemovie.h deleted file mode 100644 index 2ba28a88448..00000000000 --- a/source/blender/editors/include/BIF_writemovie.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * $Id: BIF_writemovie.h 229 2002-12-27 13:11:01Z mein $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_WRITEMOVIE_H -#define BIF_WRITEMOVIE_H - -void start_movie(void); -void append_movie(int fnum); -void end_movie(void); - -#endif - diff --git a/source/blender/editors/include/BSE_drawimasel.h b/source/blender/editors/include/BSE_drawimasel.h deleted file mode 100644 index 6e95bcca2f9..00000000000 --- a/source/blender/editors/include/BSE_drawimasel.h +++ /dev/null @@ -1,60 +0,0 @@ -/** - * $Id: BSE_drawimasel.h 11920 2007-09-02 17:25:03Z elubie $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_DRAWIMASEL_H -#define BSE_DRAWIMASEL_H - - -/* button events */ -#define B_FS_FILENAME 1 -#define B_FS_DIRNAME 2 -#define B_FS_DIR_MENU 3 -#define B_FS_PARDIR 4 -#define B_FS_LOAD 5 -#define B_FS_CANCEL 6 -#define B_FS_LIBNAME 7 -#define B_FS_BOOKMARK 8 - -/* ui geometry */ -#define IMASEL_BUTTONS_HEIGHT 60 -#define TILE_BORDER_X 8 -#define TILE_BORDER_Y 8 - -struct ScrArea; -struct SpaceImaSel; - -void drawimaselspace(struct ScrArea *sa, void *spacedata); -void calc_imasel_rcts(SpaceImaSel *simasel, int winx, int winy); -void do_imasel_buttonevents(short event, SpaceImaSel *simasel); - -#endif /* BSE_DRAWIMASEL_H */ - diff --git a/source/blender/editors/include/BSE_drawipo.h b/source/blender/editors/include/BSE_drawipo.h deleted file mode 100644 index e0ab9e18acb..00000000000 --- a/source/blender/editors/include/BSE_drawipo.h +++ /dev/null @@ -1,76 +0,0 @@ -/** - * $Id: BSE_drawipo.h 5523 2005-10-20 14:41:10Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_DRAWIPO_H -#define BSE_DRAWIPO_H - -#define IN_2D_VERT_SCROLL(A) (BLI_in_rcti(&G.v2d->vert, A[0], A[1])) -#define IN_2D_HORIZ_SCROLL(A) (BLI_in_rcti(&G.v2d->hor, A[0], A[1])) - -#define SELECT_REPLACE 1 -#define SELECT_ADD 2 -#define SELECT_SUBTRACT 4 -#define SELECT_INVERT 16 - -struct ScrArea; -struct EditIpo; -struct View2D; -struct rctf; - -void calc_ipogrid(void); -void draw_ipogrid(void); - -void areamouseco_to_ipoco (struct View2D *v2d, short *mval, float *x, float *y); -void ipoco_to_areaco (struct View2D *v2d, float *vec, short *mval); -void ipoco_to_areaco_noclip (struct View2D *v2d, float *vec, short *mval); - -void view2d_do_locks (struct ScrArea *cursa, int flag); -void view2d_zoom (struct View2D *v2d, float factor, int winx, int winy); -void test_view2d (struct View2D *v2d, int winx, int winy); -void calc_scrollrcts (struct ScrArea *sa, struct View2D *v2d, int winx, int winy); - -int in_ipo_buttons(void); -void draw_view2d_numbers_horiz(int drawframes); -void drawscroll(int disptype); -void drawipospace(struct ScrArea *sa, void *spacedata); - -void center_currframe(void); -void scroll_ipobuts(void); -int view2dzoom(unsigned short event); -int view2dmove(unsigned short event); -void view2dborder(void); - -struct EditIpo *select_proj_ipo(struct rctf *rectf, int event); - - -#endif /* BSE_DRAWIPO_H */ - diff --git a/source/blender/editors/include/BSE_drawnla.h b/source/blender/editors/include/BSE_drawnla.h deleted file mode 100644 index b04bde8de7c..00000000000 --- a/source/blender/editors/include/BSE_drawnla.h +++ /dev/null @@ -1,52 +0,0 @@ -/** - * $Id: BSE_drawnla.h 5478 2005-10-10 18:05:30Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_DRAWNLA_H -#define BSE_DRAWNLA_H - -struct ScrArea; -struct Base; -struct gla2DDrawInfo; -struct Object; - -void drawnlaspace(struct ScrArea *sa, void *spacedata); -void do_nlabuts(unsigned short event); - -int count_nla_levels(void); -int nla_filter (struct Base* base); - - /* changes the gla2d system to map the strip transform */ -void map_active_strip(struct gla2DDrawInfo *di, struct Object *ob, int restore); - - -#endif /* BSE_DRAWNLA */ - diff --git a/source/blender/editors/include/BSE_drawoops.h b/source/blender/editors/include/BSE_drawoops.h deleted file mode 100644 index e00e02fa6f7..00000000000 --- a/source/blender/editors/include/BSE_drawoops.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * $Id: BSE_drawoops.h 6135 2005-12-16 13:50:45Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_DRAWOOPS_H -#define BSE_DRAWOOPS_H - -struct ScrArea; -struct Oops; - -void boundbox_oops(short sel); -void give_oopslink_line(struct Oops *oops, struct OopsLink *ol, float *v1, float *v2); -void draw_oopslink(struct Oops *oops); -void draw_icon_oops(float *co, short type); -void mysbox(float x1, float y1, float x2, float y2); -unsigned int give_oops_color(short type, short sel, unsigned int *border); -void calc_oopstext(char *str, float *v1); -void draw_oops(struct Oops *oops); -void drawoopsspace(struct ScrArea *sa, void *spacedata); - -#endif /* BSE_DRAWOOPS */ - diff --git a/source/blender/editors/include/BSE_drawview.h b/source/blender/editors/include/BSE_drawview.h deleted file mode 100644 index f26856f76ac..00000000000 --- a/source/blender/editors/include/BSE_drawview.h +++ /dev/null @@ -1,88 +0,0 @@ -/** - * $Id: BSE_drawview.h 12747 2007-12-01 19:29:50Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_DRAWVIEW_H -#define BSE_DRAWVIEW_H - -struct Object; -struct BGpic; -struct rctf; -struct ScrArea; -struct ImBuf; - -void default_gl_light(void); -void init_gl_stuff(void); -void circf(float x, float y, float rad); -void circ(float x, float y, float rad); - -void do_viewbuts(unsigned short event); - -/* View3DAfter->type */ -#define V3D_XRAY 1 -#define V3D_TRANSP 2 -void add_view3d_after(struct View3D *v3d, struct Base *base, int type); - -void backdrawview3d(int test); -void check_backbuf(void); -unsigned int sample_backbuf(int x, int y); -struct ImBuf *read_backbuf(short xmin, short ymin, short xmax, short ymax); -unsigned int sample_backbuf_rect(short mval[2], int size, unsigned int min, unsigned int max, int *dist, short strict, unsigned int (*indextest)(unsigned int index)); - -void drawview3dspace(struct ScrArea *sa, void *spacedata); -void drawview3d_render(struct View3D *v3d, int winx, int winy, float winmat[][4]); - -int update_time(void); -void calc_viewborder(struct View3D *v3d, struct rctf *viewborder_r); -void view3d_set_1_to_1_viewborder(struct View3D *v3d); - -int view3d_test_clipping(struct View3D *v3d, float *vec); -void view3d_set_clipping(struct View3D *v3d); -void view3d_clr_clipping(void); - -void sumo_callback(void *obp); -void init_anim_sumo(void); -void update_anim_sumo(void); -void end_anim_sumo(void); - -void inner_play_anim_loop(int init, int mode); -int play_anim(int mode); - -void make_axis_color(char *col, char *col2, char axis); - -/* SMOOTHVIEW */ -void smooth_view(struct View3D *v3d, float *ofs, float *quat, float *dist, float *lens); -void smooth_view_to_camera(struct View3D *v3d); -void view_settings_from_ob(struct Object *ob, float *ofs, float *quat, float *dist, float *lens); -void object_view_settings(struct Object *ob, float *lens, float *clipsta, float *clipend); - -#endif /* BSE_DRAWVIEW_H */ - diff --git a/source/blender/editors/include/BSE_edit.h b/source/blender/editors/include/BSE_edit.h deleted file mode 100644 index bd693e0c521..00000000000 --- a/source/blender/editors/include/BSE_edit.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * $Id: BSE_edit.h 10524 2007-04-14 13:18:24Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_EDIT_H -#define BSE_EDIT_H - -struct Object; -struct rcti; - -int get_border(struct rcti *rect, short col); -void countall(void); -void snapmenu(void); -void mergemenu(void); -void delete_context_selected(void); -void duplicate_context_selected(void); -void toggle_shading(void); -int minmax_verts(float *min, float *max); - -void snap_sel_to_grid(void); -void snap_sel_to_curs(void); -void snap_curs_to_grid(void); -void snap_curs_to_sel(void); -void snap_to_center(void); - -#endif /* BSE_EDIT_H */ - diff --git a/source/blender/editors/include/BSE_editaction_types.h b/source/blender/editors/include/BSE_editaction_types.h deleted file mode 100644 index 48f0bc39ffc..00000000000 --- a/source/blender/editors/include/BSE_editaction_types.h +++ /dev/null @@ -1,77 +0,0 @@ -/** - * $Id: BIF_editaction.h 10519 2007-04-13 11:15:08Z aligorith $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): 2007, Joshua Leung (major Action Editor recode) - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BIF_EDITACTION_TYPES_H -#define BIF_EDITACTION_TYPES_H - -/******************************************************* */ -/* FILTERED ACTION DATA - TYPES */ - -/* types of keyframe data in ActListElem */ -#define ALE_NONE 0 -#define ALE_IPO 1 -#define ALE_ICU 2 - -/* This struct defines a structure used for quick access */ -typedef struct bActListElem { - struct bActListElem *next, *prev; - - void *data; /* source data this elem represents */ - int type; /* one of the ACTTYPE_* values */ - int flag; /* copy of elem's flags for quick access */ - int index; /* copy of adrcode where applicable */ - - void *key_data; /* motion data - ipo or ipo-curve */ - short datatype; /* type of motion data to expect */ - - void *owner; /* will either be an action channel or fake ipo-channel (for keys) */ - short ownertype; /* type of owner */ -} bActListElem; - -/******************************************************* */ -/* FILTER ACTION DATA - METHODS/TYPES */ - -/* filtering flags - under what circumstances should a channel be added */ -#define ACTFILTER_VISIBLE 0x001 /* should channels be visible */ -#define ACTFILTER_SEL 0x002 /* should channels be selected */ -#define ACTFILTER_FOREDIT 0x004 /* does editable status matter */ -#define ACTFILTER_CHANNELS 0x008 /* do we only care that it is a channel */ -#define ACTFILTER_IPOKEYS 0x010 /* only channels referencing ipo's */ -#define ACTFILTER_ONLYICU 0x020 /* only reference ipo-curves */ -#define ACTFILTER_FORDRAWING 0x040 /* make list for interface drawing */ - -/* Action Editor - Main Data types */ -#define ACTCONT_NONE 0 -#define ACTCONT_ACTION 1 -#define ACTCONT_SHAPEKEY 2 - -#endif diff --git a/source/blender/editors/include/BSE_editipo.h b/source/blender/editors/include/BSE_editipo.h deleted file mode 100644 index bc181743dac..00000000000 --- a/source/blender/editors/include/BSE_editipo.h +++ /dev/null @@ -1,179 +0,0 @@ -/** - * $Id: BSE_editipo.h 12703 2007-11-28 12:11:06Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_EDITIPO_H -#define BSE_EDITIPO_H - -struct TransVert; -struct IpoCurve; -struct BezTriple; -struct Ipo; -struct EditIpo; -struct ID; -struct ListBase; -struct Object; -struct IpoKey; -struct TransOb; -struct Tex; -struct TransInfo; - -void remake_object_ipos(struct Object *ob); -char *getname_ac_ei(int nr); -char *getname_co_ei(int nr); -char *getname_ob_ei(int nr, int colipo); -char *getname_mtex_ei(int nr); -char *getname_tex_ei(int nr); -char *getname_mat_ei(int nr); -char *getname_world_ei(int nr); -char *getname_seq_ei(int nr); -char *getname_cu_ei(int nr); -char *getname_la_ei(int nr); -char *getname_cam_ei(int nr); -char *getname_snd_ei(int nr); -char *getname_fluidsim_ei(int nr); -char *getname_part_ei(int nr); - -char *getname_ipocurve(struct IpoCurve *icu, struct Object *ob); -int geticon_ipo_blocktype(short blocktype); - -struct EditIpo *get_active_editipo(void); - -void boundbox_ipocurve(struct IpoCurve *icu, int selectedonly); -void boundbox_ipo(struct Ipo *ipo, struct rctf *bb, int selectedonly); -void editipo_changed(struct SpaceIpo *si, int doredraw); -void scale_editipo(void); - -unsigned int ipo_rainbow(int cur, int tot); - -void test_editipo(int doit); -void get_status_editipo(void); -void update_editipo_flags(void); -void set_editflag_editipo(void); -void ipo_toggle_showkey(void); -void swap_selectall_editipo(void); -void swap_visible_editipo(void); -void deselectall_editipo(void); - -void move_to_frame(void); -void do_ipowin_buts(short event); -void do_ipo_selectbuttons(void); - - -/* gets ipo curve, creates if needed */ -struct IpoCurve *verify_ipocurve(struct ID *, short, char *, char *, char *, int); -struct Ipo *verify_ipo(struct ID *, short, char *, char *, char *); -int texchannel_to_adrcode(int channel); - -int insert_bezt_icu(struct IpoCurve *icu, struct BezTriple *bezt); -void insert_vert_icu(struct IpoCurve *icu, float x, float y, short fast); -void add_vert_ipo(void); - -void add_duplicate_editipo(void); -void remove_doubles_ipo(void); -void clean_ipo(void); -void clean_ipo_curve(struct IpoCurve *icu); -void smooth_ipo(void); -void join_ipo_menu(void); -void join_ipo(int mode); -void ipo_snap_menu(void); -void ipo_snap(short event); -void ipo_mirror_menu(void); -void ipo_mirror(short event); -void mouse_select_ipo(void); -void sethandles_ipo(int code); -void select_ipo_bezier_keys(struct Ipo *ipo, int selectmode); -void select_icu_bezier_keys(struct IpoCurve *icu, int selectmode); -void set_ipotype(void); -void borderselect_ipo(void); -void del_ipo(int need_check); -void del_ipoCurve ( struct IpoCurve * icu ); -void free_ipocopybuf(void); -void copy_editipo(void); -void paste_editipo(void); - -void set_exprap_ipo(int mode); - -void set_speed_editipo(float speed); -void insertkey(ID *id, int blocktype, char *actname, char *constname, int adrcode, short fast); -void insertkey_smarter(ID *id, int blocktype, char *actname, char *constname, int adrcode); -void insertkey_editipo(void); -void common_insertkey(void); -void free_ipokey(struct ListBase *lb); -void add_to_ipokey(struct ListBase *lb, struct BezTriple *bezt, int nr, int len); -void make_ipokey(void); -void make_ipokey_spec(struct ListBase *lb, struct Ipo *ipo); -void make_ipokey_transform(struct Object *ob, struct ListBase *lb, int sel); -void update_ipokey_val(void); -void set_tob_old(float *old, float *poin); -void set_ipo_pointers_transob(struct IpoKey *ik, struct TransOb *tob); -void nextkey(struct ListBase *elems, int dir); -void movekey_ipo(int dir); -void movekey_obipo(int dir); -void nextkey_ipo(int dir); -void nextkey_obipo(int dir); -void filter_sampledata(float *data, int sfra, int efra); -void sampledata_to_ipocurve(float *data, int sfra, int efra, struct IpoCurve *icu); -void ipo_record(void); - -void make_ipo_transdata(struct TransInfo *t); -void remake_ipo_transdata(struct TransInfo *t); -void transform_ipo(int mode); - -void actstrip_map_ipo_keys(struct Object *ob, struct Ipo *ipo, short restore, short only_keys); - -void sethandles_ipo_keys(struct Ipo *ipo, int code); -void snap_ipo_keys(struct Ipo *ipo, short snaptype); -void mirror_ipo_keys(struct Ipo *ipo, short mirror_mode); -void setipotype_ipo(struct Ipo *ipo, int code); -void set_ipo_key_selection(struct Ipo *ipo, int sel); -int is_ipo_key_selected(struct Ipo *ipo); -void delete_icu_key(struct IpoCurve *icu, int index); -void delete_ipo_keys(struct Ipo *ipo); -int fullselect_ipo_keys(struct Ipo *ipo); -int add_trans_ipo_keys(struct Ipo *ipo, struct TransVert *tv, int tvtot); -void duplicate_ipo_keys(struct Ipo *ipo); -void borderselect_ipo_key(struct Ipo *ipo, float xmin, float xmax, int val); -void borderselect_icu_key(struct IpoCurve *icu, float xmin, float xmax, - int (*select_function)(struct BezTriple *)); -int insertmatrixkey(ID *id, int blocktype, char *actname, char *constname, int adrcode); -void insertfloatkey(ID *id, int blocktype, char *actname, char *constname, int adrcode, float floatkey); -void select_ipo_key(struct Ipo *ipo, float selx, int sel); -void select_icu_key(struct IpoCurve *icu, float selx, int selectmode); -void setexprap_ipoloop(struct Ipo *ipo, int code); - -/* callbacks */ -int select_bezier_add(struct BezTriple *bezt); -int select_bezier_subtract(struct BezTriple *bezt); -int select_bezier_invert(struct BezTriple *bezt); - -#endif /* BSE_EDITIPO_H */ - diff --git a/source/blender/editors/include/BSE_editipo_types.h b/source/blender/editors/include/BSE_editipo_types.h deleted file mode 100644 index 1a409f53f1e..00000000000 --- a/source/blender/editors/include/BSE_editipo_types.h +++ /dev/null @@ -1,53 +0,0 @@ -/** - * $Id: BSE_editipo_types.h 2747 2004-07-05 09:15:02Z jesterking $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_EDITIPO_TYPES_H -#define BSE_EDITIPO_TYPES_H - -struct BezTriple; - -typedef struct IpoKey { - struct IpoKey *next, *prev; - short flag, rt; - float val; - struct BezTriple **data; -} IpoKey; - -typedef struct EditIpo { - char name[32]; // same length as keyblock->name - IpoCurve *icu; - short adrcode, flag; - short disptype, rt; - unsigned int col; -} EditIpo; - -#endif /* BSE_EDITIPO_TYPES_H */ diff --git a/source/blender/editors/include/BSE_editnla_types.h b/source/blender/editors/include/BSE_editnla_types.h deleted file mode 100644 index d63e373d085..00000000000 --- a/source/blender/editors/include/BSE_editnla_types.h +++ /dev/null @@ -1,41 +0,0 @@ -/** - * $Id: BSE_editnla_types.h 5478 2005-10-10 18:05:30Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_EDITNLA_TYPES_H -#define BSE_EDITNLA_TYPES_H - -#define NLAWIDTH 196 -#define NLACHANNELHEIGHT 16 -#define NLACHANNELSKIP 1 - -#endif /* BSE_EDITNLA_TYPES_H */ - diff --git a/source/blender/editors/include/BSE_filesel.h b/source/blender/editors/include/BSE_filesel.h deleted file mode 100644 index 0fdfde7c976..00000000000 --- a/source/blender/editors/include/BSE_filesel.h +++ /dev/null @@ -1,66 +0,0 @@ -/** - * $Id: BSE_filesel.h 11920 2007-09-02 17:25:03Z elubie $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * - */ - -#ifndef BSE_FILESEL_H -#define BSE_FILESEL_H - -struct SpaceFile; -struct direntry; -struct ID; -struct ScrArea; -struct BWinEvent; - -void filesel_statistics(struct SpaceFile *sfile, int *totfile, int *selfile, float *totlen, float *sellen); -void test_flags_file(struct SpaceFile *sfile); -void sort_filelist(struct SpaceFile *sfile); -void read_dir(struct SpaceFile *sfile); -void freefilelist(struct SpaceFile *sfile); -void parent(struct SpaceFile *sfile); -void swapselect_file(struct SpaceFile *sfile); -void drawfilespace(struct ScrArea *sa, void *spacedata); - -void activate_fileselect(int type, char *title, char *file, void (*func)(char *)); -void activate_fileselect_menu(int type, char *title, char *file, char *pupmenu, short *menup, void (*func)(char *)); -void activate_fileselect_args(int type, char *title, char *file, void (*func)(char *, void *, void *), void *arg1, void *arg2); - -void activate_databrowse(struct ID *id, int idcode, int fromcode, int retval, short *menup, void (*func)(unsigned short)); -void activate_databrowse_args(struct ID *id, int idcode, int fromcode, short *menup, void (*func)(char *, void *, void *), void *arg1, void *arg2); - -void filesel_prevspace(void); -void free_filesel_spec(char *dir); -void winqreadfilespace(struct ScrArea *sa, void *spacedata, struct BWinEvent *evt); -void main_to_filelist(struct SpaceFile *sfile); - -void clever_numbuts_filesel(void); -#endif - diff --git a/source/blender/editors/include/BSE_headerbuttons.h b/source/blender/editors/include/BSE_headerbuttons.h deleted file mode 100644 index 7c7ca0957de..00000000000 --- a/source/blender/editors/include/BSE_headerbuttons.h +++ /dev/null @@ -1,158 +0,0 @@ -/** - * $Id: BSE_headerbuttons.h 10893 2007-06-08 14:17:13Z jiri $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_HEADERBUTTONS_H -#define BSE_HEADERBUTTONS_H - -struct uiBlock; -struct ScrArea; -struct ID; -struct SpaceIpo; -struct Ipo; - -/* these used to be in blender/src/headerbuttons.c: */ -#define XIC 20 -#define YIC 20 - -int std_libbuttons(struct uiBlock *block, - short xco, short yco, int pin, short *pinpoin, - int browse, short id_code, short special, struct ID *id, struct ID *parid, - short *menupoin, int users, - int lib, int del, int autobut, int keepbut); - -char *windowtype_pup(void); - -int GetButStringLength(char *str); -void load_space_sound(char *str); -void load_sound_buttons(char *str); -/* end of declarations moved from old headerbuttons.c */ - -void update_for_newframe_muted(void); -void update_for_newframe_nodraw(int nosound); -void free_matcopybuf(void); -void clear_matcopybuf(void); -void write_vrml_fs(void); -void write_dxf_fs(void); -void write_stl_fs(void); -int buttons_do_unpack(void); -struct Scene *copy_scene(struct Scene *sce, int level); - -void buttons_active_id(struct ID **id, struct ID **idfrom); - -int start_progress_bar(void); -void end_progress_bar(void); -int progress_bar(float done, char *busy_info); - -void update_for_newframe(void); - -void action_buttons(void); -void buts_buttons(void); -void file_buttons(void); -void image_buttons(void); -void imasel_buttons(void); -void info_buttons(void); -void ipo_buttons(void); -void nla_buttons(void); -void oops_buttons(void); -void seq_buttons(void); -void sound_buttons(void); -void text_buttons(void); -void script_buttons(void); -void view3d_buttons(void); -void time_buttons(struct ScrArea *sa); -void node_buttons(struct ScrArea *sa); - -void do_global_buttons(unsigned short event); -void do_global_buttons2(short event); - -void do_action_buttons(unsigned short event); -void do_buts_buttons(short event); -void do_file_buttons(short event); -void do_image_buttons(unsigned short event); -void do_imasel_buttons(short event); -void do_info_buttons(unsigned short event); -void do_ipo_buttons(short event); -void do_layer_buttons(short event); -void do_nla_buttons(unsigned short event); -void do_oops_buttons(short event); -void do_seq_buttons(short event); -void do_sound_buttons(unsigned short event); -void do_text_buttons(unsigned short event); -void do_script_buttons(unsigned short event); -void do_view3d_buttons(short event); -void do_time_buttons(struct ScrArea *sa, unsigned short event); -void do_node_buttons(struct ScrArea *sa, unsigned short event); - -void do_headerbuttons(short event); - -/* header_ipo.c */ -void spaceipo_assign_ipo(struct SpaceIpo *si, struct Ipo *ipo); - -/* header_text.c */ -void do_text_editmenu_to3dmenu(void *arg, int event); -void do_text_formatmenu_convert(void *arg, int event); - -/* header_info.c */ -void do_info_add_meshmenu(void *arg, int event); -void do_info_add_curvemenu(void *arg, int event); -void do_info_add_surfacemenu(void *arg, int event); -void do_info_add_metamenu(void *arg, int event); -void do_info_add_lampmenu(void *arg, int event); -void do_info_addmenu(void *arg, int event); - -/* header_node.c */ -void do_node_addmenu(void *arg, int event); - -/* header_view3d.c */ -void do_view3d_select_objectmenu(void *arg, int event); -void do_view3d_select_object_groupedmenu(void *arg, int event); -void do_view3d_select_object_linkedmenu(void *arg, int event); -void do_view3d_select_object_layermenu(void *arg, int event); -void do_view3d_select_object_typemenu(void *arg, int event); -void do_view3d_select_faceselmenu(void *arg, int event); -void do_view3d_select_meshmenu(void *arg, int event); -void do_view3d_select_curvemenu(void *arg, int event); -void do_view3d_select_metaballmenu(void *arg, int event); -void do_view3d_edit_snapmenu(void *arg, int event); -void do_view3d_edit_mirrormenu(void *arg, int event); -void do_view3d_transform_moveaxismenu(void *arg, int event); -void do_view3d_transform_rotateaxismenu(void *arg, int event); -void do_view3d_transform_scaleaxismenu(void *arg, int event); -void do_view3d_object_mirrormenu(void *arg, int event); -void do_view3d_edit_mesh_normalsmenu(void *arg, int event); -void do_view3d_edit_mesh_verticesmenu(void *arg, int event); -void do_view3d_edit_mesh_edgesmenu(void *arg, int event); -void do_view3d_edit_mesh_facesmenu(void *arg, int event); -void do_view3d_edit_curve_segmentsmenu(void *arg, int event); -void do_view3d_edit_curve_showhidemenu(void *arg, int event); - -#endif /* BSE_HEADERBUTTONS_H */ diff --git a/source/blender/editors/include/BSE_node.h b/source/blender/editors/include/BSE_node.h deleted file mode 100644 index 171a277e8e6..00000000000 --- a/source/blender/editors/include/BSE_node.h +++ /dev/null @@ -1,137 +0,0 @@ -/** - * $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 opt ion) 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) 2005 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL BLOCK ***** - */ - -#ifndef BSE_NODE_H -#define BSE_NODE_H - -/* ********** drawing sizes *********** */ -#define NODE_DY 20 -#define NODE_DYS 10 -#define NODE_SOCKSIZE 5 -#define BASIS_RAD 8.0f -#define HIDDEN_RAD 15.0f - - -struct SpaceNode; -struct bNode; -struct bNodeTree; -struct Material; -struct ID; -struct Scene; -struct Image; -struct ImageUser; - -/* ************* API for editnode.c *********** */ - - /* helper calls to retreive active context for buttons, does groups */ -struct Material *editnode_get_active_material(struct Material *ma); -struct bNode *editnode_get_active_idnode(struct bNodeTree *ntree, short id_code); -struct bNode *editnode_get_active(struct bNodeTree *ntree); - -void snode_tag_dirty(struct SpaceNode *snode); - -void snode_set_context(struct SpaceNode *snode); - -void snode_home(struct ScrArea *sa, struct SpaceNode *snode); -void snode_zoom_in(struct ScrArea *sa); -void snode_zoom_out(struct ScrArea *sa); - -void node_deselectall(struct SpaceNode *snode, int swap); -void node_border_select(struct SpaceNode *snode); - -void node_delete(struct SpaceNode *snode); -void node_make_group(struct SpaceNode *snode); -void node_ungroup(struct SpaceNode *snode); -void snode_make_group_editable(struct SpaceNode *snode, struct bNode *gnode); -void node_hide(struct SpaceNode *snode); -void node_read_renderlayers(struct SpaceNode *snode); -void clear_scene_in_nodes(struct Scene *sce); - -void node_transform_ext(int mode, int unused); -void node_shader_default(struct Material *ma); -void node_composit_default(struct Scene *scene); - -int node_has_hidden_sockets(struct bNode *node); - -struct bNode *node_add_node(struct SpaceNode *snode, int type, float locx, float locy); -void node_adduplicate(struct SpaceNode *snode); - -void snode_autoconnect(struct SpaceNode *snode, struct bNode *node_to, int flag); -void node_select_linked(struct SpaceNode *snode, int out); - -struct ImageUser *ntree_get_active_iuser(struct bNodeTree *ntree); - -void imagepaint_composite_tags(struct bNodeTree *ntree, struct Image *image, struct ImageUser *iuser); - - - -/* ************* drawnode.c *************** */ -struct SpaceNode; -struct bNodeLink; -void node_draw_link(struct SpaceNode *snode, struct bNodeLink *link); - -void init_node_butfuncs(void); - -/* exported to CMP and SHD nodes */ -//void node_ID_title_cb(void *node_v, void *unused_v); -//void node_but_title_cb(void *node_v, void *but_v); -//void node_texmap_cb(void *texmap_v, void *unused_v); -//void node_new_mat_cb(void *ntree_v, void *node_v); -//void node_browse_mat_cb(void *ntree_v, void *node_v); -//void node_mat_alone_cb(void *node_v, void *unused); - - -//void node_browse_image_cb(void *ntree_v, void *node_v); -//void node_active_cb(void *ntree_v, void *node_v); -//void node_image_type_cb(void *node_v, void *unused); -//char *node_image_type_pup(void); -//char *layer_menu(struct RenderResult *rr); -//void image_layer_cb(void *ima_v, void *iuser_v); -//void set_render_layers_title(void *node_v, void *unused); -//char *scene_layer_menu(struct Scene *sce); -//void node_browse_scene_cb(void *ntree_v, void *node_v); - - -//int node_buts_curvevec(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_curvecol(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_rgb(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_texture(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_valtorgb(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_value(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_mix_rgb(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_group(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_normal(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr); -//int node_buts_math(struct uiBlock *block, struct bNodeTree *ntree, struct bNode *node, struct rctf *butr) ; - - -/* ************* Shader nodes ***************** */ - - -#endif - diff --git a/source/blender/editors/include/BSE_seqaudio.h b/source/blender/editors/include/BSE_seqaudio.h deleted file mode 100644 index 985c4be73d2..00000000000 --- a/source/blender/editors/include/BSE_seqaudio.h +++ /dev/null @@ -1,53 +0,0 @@ -/** - * ***** 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) 2003 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * - */ - -#ifndef BSE_SEQAUDIO_H -#define BSE_SEQAUDIO_H - -#include "SDL.h" -/* muha, we don't init (no SDL_main)! */ -#ifdef main -# undef main -#endif - -#include "DNA_sound_types.h" - -void audio_mixdown(); -void audio_makestream(bSound *sound); -void audiostream_play(Uint32 startframe, Uint32 duration, int mixdown); -void audiostream_fill(Uint8* mixdown, int len); -void audiostream_start(Uint32 frame); -void audiostream_scrub(Uint32 frame); -void audiostream_stop(void); -int audiostream_pos(void); - -#endif - diff --git a/source/blender/editors/include/BSE_seqeffects.h b/source/blender/editors/include/BSE_seqeffects.h deleted file mode 100644 index f76906bec50..00000000000 --- a/source/blender/editors/include/BSE_seqeffects.h +++ /dev/null @@ -1,96 +0,0 @@ -/** - * $Id: BSE_seqeffects.h 9554 2006-12-31 15:38:14Z schlaile $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): Peter Schlaile < peter [at] schlaile [dot] de > - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * - */ - -#ifndef BSE_SEQUENCE_EFFECTS_H -#define BSE_SEQUENCE_EFFECTS_H - -/* Wipe effect */ -enum {DO_SINGLE_WIPE, DO_DOUBLE_WIPE, DO_BOX_WIPE, DO_CROSS_WIPE, - DO_IRIS_WIPE,DO_CLOCK_WIPE}; - -struct Sequence; -struct ImBuf; - -struct SeqEffectHandle { - /* constructors & destructor */ - /* init & init_plugin are _only_ called on first creation */ - void (*init)(struct Sequence *seq); - void (*init_plugin)(struct Sequence * seq, const char * fname); - - /* number of input strips needed - (called directly after construction) */ - int (*num_inputs)(); - - /* load is called first time after readblenfile in - get_sequence_effect automatically */ - void (*load)(struct Sequence *seq); - - /* duplicate */ - void (*copy)(struct Sequence *dst, struct Sequence * src); - - /* destruct */ - void (*free)(struct Sequence *seq); - - /* returns: -1: no input needed, - 0: no early out, - 1: out = ibuf1, - 2: out = ibuf2 */ - int (*early_out)(struct Sequence *seq, - float facf0, float facf1); - - /* stores the y-range of the effect IPO */ - void (*store_icu_yrange)(struct Sequence * seq, - short adrcode, float * ymin, float * ymax); - - /* stores the default facf0 and facf1 if no IPO is present */ - void (*get_default_fac)(struct Sequence * seq, int cfra, - float * facf0, float * facf1); - - /* execute the effect - sequence effects are only required to either support - float-rects or byte-rects - (mixed cases are handled one layer up...) */ - - void (*execute)(struct Sequence *seq, int cfra, - float facf0, float facf1, - int x, int y, - struct ImBuf *ibuf1, struct ImBuf *ibuf2, - struct ImBuf *ibuf3, struct ImBuf *out); -}; - -struct SeqEffectHandle get_sequence_effect(struct Sequence * seq); -int get_sequence_effect_num_inputs(int seq_type); -void sequence_effect_speed_rebuild_map(struct Sequence * seq, int force); - -#endif - diff --git a/source/blender/editors/include/BSE_seqscopes.h b/source/blender/editors/include/BSE_seqscopes.h deleted file mode 100644 index ac803100b8a..00000000000 --- a/source/blender/editors/include/BSE_seqscopes.h +++ /dev/null @@ -1,38 +0,0 @@ -/** - * $Id: BSE_seqscopes.h 6983 2006-03-07 20:01:12Z schlaile $ - * - * ***** 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. - * - * 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. - * - * Author: Peter Schlaile < peter [at] schlaile [dot] de > - * - * ***** END GPL LICENSE BLOCK ***** - * - */ - -#ifndef BSE_SEQUENCE_SCOPES_H -#define BSE_SEQUENCE_SCOPES_H - -struct ImBuf; - -struct ImBuf *make_waveform_view_from_ibuf(struct ImBuf * ibuf); -struct ImBuf *make_vectorscope_view_from_ibuf(struct ImBuf * ibuf); - -#endif - diff --git a/source/blender/editors/include/BSE_sequence.h b/source/blender/editors/include/BSE_sequence.h deleted file mode 100644 index 28143828568..00000000000 --- a/source/blender/editors/include/BSE_sequence.h +++ /dev/null @@ -1,89 +0,0 @@ -/** - * $Id: BSE_sequence.h 12615 2007-11-18 17:39:30Z schlaile $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * - */ - -#ifndef BSE_SEQUENCE_H -#define BSE_SEQUENCE_H - - -struct PluginSeq; -struct StripElem; -struct TStripElem; -struct Strip; -struct Sequence; -struct ListBase; -struct Editing; -struct ImBuf; -struct Scene; - -void free_tstripdata(int len, struct TStripElem *se); -void free_strip(struct Strip *strip); -void new_tstripdata(struct Sequence *seq); -void free_sequence(struct Sequence *seq); -void build_seqar(struct ListBase *seqbase, struct Sequence ***seqar, int *totseq); -void free_editing(struct Editing *ed); -void calc_sequence(struct Sequence *seq); -void calc_sequence_disp(struct Sequence *seq); -void sort_seq(void); -void clear_scene_in_allseqs(struct Scene *sce); - -int evaluate_seq_frame(int cfra); -struct StripElem *give_stripelem(struct Sequence *seq, int cfra); -struct TStripElem *give_tstripelem(struct Sequence *seq, int cfra); -void set_meta_stripdata(struct Sequence *seqm); -struct ImBuf *give_ibuf_seq(int rectx, int recty, int cfra, int chansel); -/* chansel: render this channel. Default=0 (renders end result)*/ -struct ImBuf *give_ibuf_seq_direct(int rectx, int recty, int cfra, - struct Sequence * seq); - -/* sequence prefetch API */ -void seq_start_threads(); -void seq_stop_threads(); -void give_ibuf_prefetch_request(int rectx, int recty, int cfra, int chanshown); -void seq_wait_for_prefetch_ready(); -struct ImBuf * give_ibuf_seq_threaded(int rectx, int recty, int cfra, - int chanshown); - - -void free_imbuf_seq_except(int cfra); -void free_imbuf_seq_with_ipo(struct Ipo * ipo); -void free_imbuf_seq(void); - -void update_changed_seq_and_deps(struct Sequence *seq, int len_change, int ibuf_change); - -/* still bad level call... */ -struct RenderResult; -void do_render_seq(struct RenderResult *rr, int cfra); - - -#endif - diff --git a/source/blender/editors/include/BSE_time.h b/source/blender/editors/include/BSE_time.h deleted file mode 100644 index d5cff9f5e5f..00000000000 --- a/source/blender/editors/include/BSE_time.h +++ /dev/null @@ -1,71 +0,0 @@ -/** - * $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 opt ion) 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) 2005 Blender Foundation. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_TIME_H -#define BSE_TIME_H - -struct ListBase; -struct View2D; - -/* ******** Markers - General Api ********* */ -void add_marker(int frame); -void duplicate_marker(void); -void remove_marker(void); -void rename_marker(void); -void transform_markers(int mode, int smode); - -void borderselect_markers(void); -void deselect_markers(short test, short sel); -struct TimeMarker *find_nearest_marker(int clip_y); - -void nextprev_marker(short dir); -void get_minmax_markers(short sel, float *first, float *last); -int find_nearest_marker_time(float dx); - -void add_marker_to_cfra_elem(struct ListBase *lb, struct TimeMarker *marker, short only_sel); -void make_marker_cfra_list(struct ListBase *lb, short only_sel); - -void draw_markers_timespace(int lines); -TimeMarker *get_frame_marker(int frame); - -/* ******** Animation - Preview Range ************* */ -void anim_previewrange_set(void); -void anim_previewrange_clear(void); - -void draw_anim_preview_timespace(void); - -/* *********** TimeLine Specific ***************/ -void timeline_frame_to_center(void); -void nextprev_timeline_key(short dir); - -#endif - diff --git a/source/blender/editors/include/BSE_trans_types.h b/source/blender/editors/include/BSE_trans_types.h deleted file mode 100644 index 5513c3c5fe3..00000000000 --- a/source/blender/editors/include/BSE_trans_types.h +++ /dev/null @@ -1,90 +0,0 @@ -/** - * $Id: BSE_trans_types.h 12441 2007-10-31 13:56:07Z ton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ - -#ifndef BSE_TRANS_TYPES_H -#define BSE_TRANS_TYPES_H - -struct Object; -struct MDeformVert; -struct ColorBand; - -typedef struct TransOb { - float *loc; - float oldloc[9]; - float *eff; - float oldeff[3]; - float *rot; - float oldrot[12]; - float olddrot[3]; - float *quat; - float oldquat[16]; - float olddquat[4]; - float *size; - float oldsize[12]; - float olddsize[3]; - float obmat[3][3]; - float obinv[3][3]; - float parmat[3][3]; - float parinv[3][3]; - float obvec[3]; - int flag; /* keys */ - float *locx, *locy, *locz; - float *rotx, *roty, *rotz; - float *quatx, *quaty, *quatz, *quatw; - float *sizex, *sizey, *sizez; - /* __NLA */ - float axismat[3][3]; /* Restmat of object (for localspace transforms) */ - void *data; /* Arbitrary data */ - /* end __NLA */ - struct Object *ob; -} TransOb; - -typedef struct TransVert { - float *loc; - float oldloc[3], fac; - float *val, oldval; - int flag; - float *nor; -} TransVert; - -typedef struct VPaint { - float r, g, b, a; - float size; /* of brush */ - float gamma, mul; - short mode, flag; - int tot, pad; /* allocation size of prev buffers */ - unsigned int *vpaint_prev; /* previous mesh colors */ - struct MDeformVert *wpaint_prev; /* previous vertex weights */ -} VPaint; - -#endif /* BSE_TRANS_TYPES_H */ - diff --git a/source/blender/editors/include/BSE_types.h b/source/blender/editors/include/BSE_types.h deleted file mode 100644 index b4b84c2dbf0..00000000000 --- a/source/blender/editors/include/BSE_types.h +++ /dev/null @@ -1,69 +0,0 @@ -/** - * $Id: BSE_types.h 8957 2006-11-20 04:28:02Z blendix $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ -/* forward declarations for some prototype header */ -/* these may wildly occur in other header files, too */ - -struct BGpic; -struct SpaceText; -struct Oops; -struct OopsLink; -struct uiBlock; -struct BoundBox; -struct Image; -struct ImBuf; -struct SpaceImaSel; -struct Sequence; -struct Scene; -struct IpoCurve; -struct Ipo; -struct IpoKey; -struct Mesh; -struct MTFace; -struct Object; -struct TransOb; -struct TransVert; -struct BPoint; -struct BezTriple; - -struct Nurb; - -struct EditFace; -struct EditVert; -struct EditEdge; -struct EditIpo; - -struct bArmature; -struct Bone; - -/* interface crap */ -struct uiBut; - diff --git a/source/blender/editors/include/BSE_view.h b/source/blender/editors/include/BSE_view.h deleted file mode 100644 index 684113060f5..00000000000 --- a/source/blender/editors/include/BSE_view.h +++ /dev/null @@ -1,97 +0,0 @@ -/** - * $Id: BSE_view.h 12237 2007-10-08 22:17:51Z broken $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - * protos for view.c -- not complete - */ - -#ifndef BSE_VIEW_H -#define BSE_VIEW_H - -struct Object; -struct BoundBox; -struct View3D; -struct ScrArea; - -typedef struct ViewDepths { - unsigned short w, h; - float *depths; - double depth_range[2]; - - char damaged; -} ViewDepths; - -#define PERSP_WIN 0 -#define PERSP_VIEW 1 -#define PERSP_STORE 2 - -void persp_general(int a); -void persp(int a); - -/* note, the define below is still used for shorts, to calc distances... */ -#define IS_CLIPPED 12000 -void view3d_get_object_project_mat(struct ScrArea *area, struct Object *ob, float pmat[4][4], float vmat[4][4]); -void view3d_project_float(struct ScrArea *area, float *vec, float *adr, float mat[4][4]); -void view3d_project_short_clip(struct ScrArea *area, float *vec, short *adr, float projmat[4][4], float viewmat[4][4]); -void view3d_project_short_noclip(struct ScrArea *area, float *vec, short *adr, float mat[4][4]); - -void initgrabz(float x, float y, float z); -void window_to_3d(float *vec, short mx, short my); -void project_short(float *vec, short *adr); -void project_short_noclip(float *vec, short *adr); -void project_int(float *vec, int *adr); -void project_float(float *vec, float *adr); - -int boundbox_clip(float obmat[][4], struct BoundBox *bb); -void fdrawline(float x1, float y1, float x2, float y2); -void fdrawbox(float x1, float y1, float x2, float y2); -void sdrawline(short x1, short y1, short x2, short y2); -void sdrawbox(short x1, short y1, short x2, short y2); -void calctrackballvecfirst(struct rcti *area, short *mval, float *vec); -void calctrackballvec(struct rcti *area, short *mval, float *vec); -void viewmove(int mode); -void view_zoom_mouseloc(float dfac, short *mouseloc); - -int get_view3d_viewplane(int winxi, int winyi, rctf *viewplane, float *clipsta, float *clipend, float *pixsize); -void setwinmatrixview3d(int winx, int winy, struct rctf *rect); - -void obmat_to_viewmat(struct Object *ob, short smooth); -void setviewmatrixview3d(void); -float *give_cursor(void); -unsigned int free_localbit(void); -void initlocalview(void); -void centerview(void); -void restore_localviewdata(struct View3D *vd); -void endlocalview(struct ScrArea *sa); -void view3d_home(int center); -short view3d_opengl_select(unsigned int *buffer, unsigned int buffsize, short x1, short y1, short x2, short y2); -void view3d_align_axis_to_vector(struct View3D *v3d, int axisidx, float vec[3]); - -#endif - diff --git a/source/blender/editors/include/blendef.h b/source/blender/editors/include/blendef.h deleted file mode 100644 index 96bd6d10591..00000000000 --- a/source/blender/editors/include/blendef.h +++ /dev/null @@ -1,465 +0,0 @@ -/* $Id: blendef.h 12752 2007-12-01 23:25:00Z campbellbarton $ - * - * ***** 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. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL/BL DUAL LICENSE BLOCK ***** - */ -#ifndef BLENDEF_H -#define BLENDEF_H - - -/* **************** MAX ********************* */ - -#define MAXFRAME 300000 -#define MAXFRAMEF 300000.0f - -#define MINFRAME 1 -#define MINFRAMEF 1.0 - -/* max length material array, 16 because of bits in matfrom */ -#define MAXPICKBUF 10000 -#define MAXSEQ 32 - -/* in buttons.c */ -#define MAX_EFFECT 20 - -#ifndef MAXFLOAT -#define MAXFLOAT ((float)3.40282347e+38) -#endif - -/* also fill in structs itself, dna cannot handle defines, duplicate with utildefines.h still */ -#ifndef FILE_MAXDIR -#define FILE_MAXDIR 160 -#define FILE_MAXFILE 80 -#endif - - -#include - - - - -/* **************** GENERAL ********************* */ - -// return values - -#define RET_OK 0 -#define RET_ERROR 1 -#define RET_CANCEL 2 -#define RET_YES (1 == 1) -#define RET_NO (1 == 0) - -#if defined(__sgi) || defined(__sparc) || defined(__sparc__) || defined (__PPC__) || defined (__ppc__) || defined (__BIG_ENDIAN__) -/* big endian */ -#define MAKE_ID2(c, d) ( (c)<<8 | (d) ) -#define MOST_SIG_BYTE 0 -#define BBIG_ENDIAN -#else -/* little endian */ -#define MAKE_ID2(c, d) ( (d)<<8 | (c) ) -#define MOST_SIG_BYTE 1 -#define BLITTLE_ENDIAN -#endif - -#define SELECT 1 -#define HIDDEN 1 -#define FIRST 1 -#define ACTIVE 2 -/*#ifdef WITH_VERSE*/ -#define VERSE 3 -/*#endif*/ -#define DESELECT 0 -#define NOT_YET 0 -#define VISIBLE 0 -#define LAST 0 - -#define TESTBASE(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) ) -#define TESTBASELIB(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0)) -#define BASE_SELECTABLE(base) ((base->lay & G.vd->lay) && (base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0) -#define FIRSTBASE G.scene->base.first -#define LASTBASE G.scene->base.last -#define BASACT (G.scene->basact) -#define OBACT (BASACT? BASACT->object: 0) -#define ID_NEW(a) if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid -#define ID_NEW_US(a) if( (a)->id.newid) {(a)= (void *)(a)->id.newid; (a)->id.us++;} -#define ID_NEW_US2(a) if( ((ID *)a)->newid) {(a)= ((ID *)a)->newid; ((ID *)a)->us++;} -#define CFRA (G.scene->r.cfra) -#define F_CFRA ((float)(G.scene->r.cfra)) -#define SFRA (G.scene->r.sfra) -#define EFRA (G.scene->r.efra) -#define PSFRA ((G.scene->r.psfra != 0)? (G.scene->r.psfra): (G.scene->r.sfra)) -#define PEFRA ((G.scene->r.psfra != 0)? (G.scene->r.pefra): (G.scene->r.efra)) -#define FRA2TIME(a) ((((double) G.scene->r.frs_sec_base) * (a)) / G.scene->r.frs_sec) -#define TIME2FRA(a) ((((double) G.scene->r.frs_sec) * (a)) / G.scene->r.frs_sec_base) -#define FPS (((double) G.scene->r.frs_sec) / G.scene->r.frs_sec_base) - -#define ISPOIN(a, b, c) ( (a->b) && (a->c) ) -#define ISPOIN3(a, b, c, d) ( (a->b) && (a->c) && (a->d) ) -#define ISPOIN4(a, b, c, d, e) ( (a->b) && (a->c) && (a->d) && (a->e) ) - -#define BEZSELECTED(bezt) (((bezt)->f1 & 1) || ((bezt)->f2 & 1) || ((bezt)->f3 & 1)) -/* for curve objects in editmode that can have hidden handles - may use for IPO's later */ -#define BEZSELECTED_HIDDENHANDLES(bezt) ((G.f & G_HIDDENHANDLES) ? (bezt)->f2 & 1 : BEZSELECTED(bezt)) - -/* psfont */ -#define FNT_PDRAW 1 -#define FNT_HAEBERLI 2 - -/* getbutton */ - -/* do_global_buttons(event) */ - -// (first event) -#define B_LOCAL_ALONE 20 - - -#define B_ACTLOCAL 24 /* __NLA */ -#define B_ACTALONE 25 /* __NLA */ -#define B_ARMLOCAL 26 /* __NLA */ -#define B_ARMALONE 27 /* __NLA */ - -#define B_WORLDLOCAL 28 -#define B_WORLDALONE 29 -#define B_LATTLOCAL 30 -#define B_MBALLLOCAL 31 -#define B_CAMERALOCAL 32 -#define B_OBLOCAL 33 -#define B_IPOLOCAL 34 -#define B_LAMPLOCAL 35 -#define B_MATLOCAL 36 -#define B_TEXLOCAL 37 -#define B_MESHLOCAL 38 -#define B_CURVELOCAL 39 - -#define B_LATTALONE 40 -#define B_MBALLALONE 41 -#define B_CAMERAALONE 42 -#define B_OBALONE 43 -#define B_IPOALONE 44 -#define B_LAMPALONE 45 -#define B_MATALONE 46 -#define B_TEXALONE 47 -#define B_MESHALONE 48 -#define B_CURVEALONE 49 - -/* EVENT < 50: alones en locals */ - -#define B_KEEPDATA 60 -#define B_CONSOLETOG 61 -#define B_DRAWINFO 62 -#define B_REDRCURW3D 63 -#define B_FLIPINFOMENU 64 -#define B_FLIPFULLSCREEN 65 -#define B_PLAINMENUS 66 - - -#define B_GLRESLIMITCHANGED 69 -#define B_SHOWSPLASH 70 -#define B_RESETAUTOSAVE 71 -#define B_SOUNDTOGGLE 72 -#define B_MIPMAPCHANGED 73 -#define B_CONSTRAINTBROWSE 74 /* __NLA */ -#define B_ACTIONDELETE 75 /* __NLA */ -#define B_ACTIONBROWSE 76 /* __NLA */ -#define B_IMAGEDELETE 77 -#define B_LTEXBROWSE 78 -#define B_MESHBROWSE 79 -#define B_EXTEXBROWSE 80 -#define B_LOADTEMP 81 -#define B_MATDELETE 82 -#define B_TEXDELETE 83 -#define B_IPODELETE 84 -#define B_WORLDDELETE 85 -#define B_WTEXBROWSE 86 -#define B_WORLDBROWSE 87 -#define B_IPOBROWSE 88 -#define B_NEWFRAME 89 -#define B_LAMPBROWSE 90 -#define B_MATBROWSE 91 -#define B_TEXBROWSE 92 -#define B_EDITBROWSE 93 -#define B_AUTOTEXNAME 94 -#define B_AUTOMATNAME 95 -#define B_MATLOCK 96 -#define B_IDNAME 97 -#define B_NEWSPACE 98 -#define B_FULL 99 -#define B_REDR 100 - - -/* VIEW3D: 100 */ -#define B_HOME 101 -#define B_LAY 102 -/* watch: codes 102-132 in in use for layers */ -#define B_AUTOKEY 139 -#define B_SCENELOCK 140 -#define B_LOCALVIEW 141 -#define B_U_CAPSLOCK 142 - -#define B_VIEWBUT 146 -#define B_PERSP 147 -#define B_PROPTOOL 148 -#define B_VIEWRENDER 149 -#define B_STARTGAME 150 - -#define B_MODESELECT 156 -#define B_AROUND 157 -#define B_SEL_VERT 158 -#define B_SEL_EDGE 159 -#define B_SEL_FACE 160 -#define B_MAN_TRANS 161 -#define B_MAN_ROT 162 -#define B_MAN_SCALE 163 -#define B_SEL_PATH 166 -#define B_SEL_POINT 167 -#define B_SEL_END 168 - -/* IPO: 200 */ -#define B_IPOHOME 201 -#define B_IPOBORDER 202 -#define B_IPOCOPY 203 -#define B_IPOPASTE 204 -#define B_IPOCONT 205 -#define B_IPOEXTRAP 206 -#define B_IPOCYCLIC 207 -#define B_IPOMAIN 208 -#define B_IPOSHOWKEY 209 -#define B_IPOCYCLICX 210 - /* warn: also used for oops and seq */ -#define B_VIEW2DZOOM 211 -#define B_IPOPIN 212 -#define B_IPO_ACTION_OB 213 -#define B_IPO_ACTION_KEY 214 -#define B_IPOVIEWCENTER 215 -#define B_IPOVIEWALL 216 -#define B_IPOREDRAW 217 - -/* OOPS: 250 */ -#define B_OOPSHOME 251 -#define B_OOPSBORDER 252 -#define B_NEWOOPS 253 -#define B_OOPSVIEWSEL 254 - -/* INFO: 300 */ -/* watch: also in filesel.c and editobject.c */ -#define B_INFOSCR 301 -#define B_INFODELSCR 302 -#define B_INFOSCE 304 -#define B_INFODELSCE 305 -#define B_FILEMENU 306 -#define B_PACKFILE 307 - -#define B_CONSOLEOUT 308 -#define B_CONSOLENUMLINES 309 -#define B_USERPREF 310 -#define B_LOADUIFONT 311 -#define B_SETLANGUAGE 312 -#define B_SETFONTSIZE 313 -#define B_SETENCODING 314 -#define B_SETTRANSBUTS 315 -#define B_DOLANGUIFONT 316 -#define B_RESTOREFONT 317 -#define B_USETEXTUREFONT 318 - -#define B_UITHEMECHANGED 320 -#define B_UITHEMECOLORMOD 321 -#define B_UITHEMERESET 322 -#define B_UITHEMEIMPORT 323 -#define B_UITHEMEEXPORT 324 - -#define B_MEMCACHELIMIT 325 -#define B_WPAINT_RANGE 326 - -/* Definitions for the fileselect buttons in user prefs */ -#define B_FONTDIRFILESEL 330 -#define B_TEXTUDIRFILESEL 331 -#define B_PLUGTEXDIRFILESEL 332 -#define B_PLUGSEQDIRFILESEL 333 -#define B_RENDERDIRFILESEL 334 -#define B_PYTHONDIRFILESEL 335 -#define B_SOUNDDIRFILESEL 336 -#define B_TEMPDIRFILESEL 337 -/* yafray: for exportdir select */ -#define B_YAFRAYDIRFILESEL 338 -#define B_PYMENUEVAL 339 /* re-eval scripts registration in menus */ -/* END Definitions for the fileselect buttons in user prefs */ - -/* IMAGE: 350 */ -#define B_SIMAGEHOME 351 -#define B_SIMABROWSE 352 -#define B_SIMAGELOAD 353 -#define B_SIMA_REDR_IMA_3D 354 -#define B_SIMAGETILE 355 -#define B_BE_SQUARE 356 -#define B_TWINANIM 357 -#define B_SIMAGEREPLACE 358 -#define B_CLIP_UV 359 -#define B_SIMAGELOAD1 360 -#define B_SIMAGEREPLACE1 361 -#define B_SIMAGEPAINTTOOL 362 -#define B_SIMAPACKIMA 363 -#define B_SIMAGESAVE 364 -#define B_SIMACLONEBROWSE 365 -#define B_SIMACLONEDELETE 366 -#define B_SIMANOTHING 368 -#define B_SIMACURVES 369 -#define B_SIMARANGE 370 -#define B_SIMA_USE_ALPHA 371 -#define B_SIMA_SHOW_ALPHA 372 -#define B_SIMA_SHOW_ZBUF 373 -#define B_SIMABRUSHBROWSE 374 -#define B_SIMABRUSHDELETE 375 -#define B_SIMABRUSHLOCAL 376 -#define B_SIMABRUSHCHANGE 377 -#define B_SIMABTEXBROWSE 378 -#define B_SIMABTEXDELETE 379 -#define B_SIMARELOAD 380 -#define B_SIMANAME 381 -#define B_SIMAMULTI 382 -#define B_TRANS_IMAGE 383 -#define B_CURSOR_IMAGE 384 -#define B_SIMA_REPACK 385 -#define B_SIMA_PLAY 386 -#define B_SIMA_RECORD 387 -#define B_SIMAPIN 388 -#define B_SIMA3DVIEWDRAW 389 - - -/* BUTS: 400 */ -#define B_BUTSHOME 401 -#define B_BUTSPREVIEW 402 -#define B_MATCOPY 403 -#define B_MATPASTE 404 -#define B_MESHTYPE 405 -#define B_CONTEXT_SWITCH 406 - -/* IMASEL: 450 */ -/* in imasel.h - not any more - elubie */ -#define B_SORTIMASELLIST 451 -#define B_RELOADIMASELDIR 452 -#define B_FILTERIMASELDIR 453 - -/* TEXT: 500 */ -#define B_TEXTBROWSE 501 -#define B_TEXTALONE 502 -#define B_TEXTLOCAL 503 -#define B_TEXTDELETE 504 -#define B_TEXTFONT 505 -#define B_TEXTSTORE 506 -#define B_TEXTLINENUM 507 -#define B_TAB_NUMBERS 508 -#define B_SYNTAX 509 - -/* SCRIPT: 525 */ -#define B_SCRIPTBROWSE 526 -#define B_SCRIPT2PREV 527 - -/* FILE: 550 */ -#define B_SORTFILELIST 551 -#define B_RELOADDIR 552 - -/* SEQUENCE: 600 */ -#define B_SEQHOME 601 -#define B_SEQCLEAR 602 - -/* SOUND: 650 */ -#define B_SOUNDBROWSE 651 -#define B_SOUNDBROWSE2 652 -#define B_SOUNDHOME 653 -#define B_PACKSOUND 654 - -/* ACTION: 701 - 750 */ -#define B_ACTHOME 701 -#define B_ACTCOPY 702 -#define B_ACTPASTE 703 -#define B_ACTPASTEFLIP 704 -#define B_ACTCYCLIC 705 -#define B_ACTCONT 706 -#define B_ACTMAIN 707 -#define B_ACTPIN 708 -#define B_ACTBAKE 709 -#define B_ACTCOPYKEYS 710 -#define B_ACTPASTEKEYS 711 - -/* TIME: 751 - 800 */ -#define B_TL_REW 751 -#define B_TL_PLAY 752 -#define B_TL_FF 753 -#define B_TL_PREVKEY 754 -#define B_TL_NEXTKEY 755 -#define B_TL_STOP 756 -#define B_TL_PREVIEWON 757 - -/* NLA: 801-850 */ -#define B_NLAHOME 801 - -/* NODE: 851-900 */ -#define B_NODEHOME 851 -#define B_NODE_USEMAT 852 -#define B_NODE_USESCENE 853 - -/* FREE 901 - 999 */ - - -#define B_NOP -1 - - -/* editbutflag */ -#define B_CLOCKWISE 1 -#define B_KEEPORIG 2 -#define B_BEAUTY 4 -#define B_SMOOTH 8 -#define B_BEAUTY_SHORT 16 -#define B_AUTOFGON 32 -#define B_KNIFE 0x80 -#define B_PERCENTSUBD 0x40 -#define B_MESH_X_MIRROR 0x100 -#define B_JOINTRIA_UV 0x200 -#define B_JOINTRIA_VCOL 0X400 -#define B_JOINTRIA_SHARP 0X800 -#define B_JOINTRIA_MAT 0X1000 - -/* DISPLAYMODE */ -#define R_DISPLAYIMAGE 0 -#define R_DISPLAYWIN 1 -#define R_DISPLAYSCREEN 2 - -/* Gvp.flag and Gwp.flag */ -#define VP_COLINDEX 1 -#define VP_AREA 2 -#define VP_SOFT 4 -#define VP_NORMALS 8 -#define VP_SPRAY 16 -#define VP_MIRROR_X 32 -#define VP_HARD 64 -#define VP_ONLYVGROUP 128 - -/* Error messages */ -#define ERROR_LIBDATA_MESSAGE "Can't edit external libdata" - - -#endif diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index c82a1f9e510..fa990a55ca7 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -640,6 +640,34 @@ typedef struct Scene { #define R_BAKE_SPACE_TANGENT 3 /* **************** SCENE ********************* */ + +/* for general use */ +#define MAXFRAME 300000 +#define MAXFRAMEF 300000.0f + +#define MINFRAME 1 +#define MINFRAMEF 1.0 + +#define TESTBASE(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0) ) +#define TESTBASELIB(base) ( ((base)->flag & SELECT) && ((base)->lay & G.vd->lay) && ((base)->object->id.lib==0) && (((base)->object->restrictflag & OB_RESTRICT_VIEW)==0)) +#define BASE_SELECTABLE(base) ((base->lay & G.vd->lay) && (base->object->restrictflag & (OB_RESTRICT_SELECT|OB_RESTRICT_VIEW))==0) +#define FIRSTBASE G.scene->base.first +#define LASTBASE G.scene->base.last +#define BASACT (G.scene->basact) +#define OBACT (BASACT? BASACT->object: 0) +#define ID_NEW(a) if( (a) && (a)->id.newid ) (a)= (void *)(a)->id.newid +#define ID_NEW_US(a) if( (a)->id.newid) {(a)= (void *)(a)->id.newid; (a)->id.us++;} +#define ID_NEW_US2(a) if( ((ID *)a)->newid) {(a)= ((ID *)a)->newid; ((ID *)a)->us++;} +#define CFRA (G.scene->r.cfra) +#define F_CFRA ((float)(G.scene->r.cfra)) +#define SFRA (G.scene->r.sfra) +#define EFRA (G.scene->r.efra) +#define PSFRA ((G.scene->r.psfra != 0)? (G.scene->r.psfra): (G.scene->r.sfra)) +#define PEFRA ((G.scene->r.psfra != 0)? (G.scene->r.pefra): (G.scene->r.efra)) +#define FRA2TIME(a) ((((double) G.scene->r.frs_sec_base) * (a)) / G.scene->r.frs_sec) +#define TIME2FRA(a) ((((double) G.scene->r.frs_sec) * (a)) / G.scene->r.frs_sec_base) +#define FPS (((double) G.scene->r.frs_sec) / G.scene->r.frs_sec_base) + #define RAD_PHASE_PATCHES 1 #define RAD_PHASE_FACES 2 diff --git a/source/blender/nodes/intern/CMP_util.h b/source/blender/nodes/intern/CMP_util.h index 7cb10b75f3a..88cc14551d8 100644 --- a/source/blender/nodes/intern/CMP_util.h +++ b/source/blender/nodes/intern/CMP_util.h @@ -67,14 +67,6 @@ #include "BIF_gl.h" #include "BIF_glutil.h" -#include "BIF_interface.h" -#include "BIF_interface_icons.h" -#include "BIF_language.h" -#include "BIF_mywindow.h" -#include "BIF_previewrender.h" -#include "BIF_resources.h" -#include "BIF_screen.h" -#include "BIF_space.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" @@ -84,16 +76,11 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "BSE_drawipo.h" -#include "BSE_node.h" -#include "BSE_view.h" - #include "RE_pipeline.h" #include "RE_shader_ext.h" #include "RE_render_ext.h" #include "butspace.h" -#include "blendef.h" #include "mydevice.h" /* *************************** operations support *************************** */ diff --git a/source/blender/nodes/intern/SHD_util.h b/source/blender/nodes/intern/SHD_util.h index f75802b7c15..e23d8cd6d41 100644 --- a/source/blender/nodes/intern/SHD_util.h +++ b/source/blender/nodes/intern/SHD_util.h @@ -31,6 +31,7 @@ #define SHD_NODE_UTIL_H_ #include +#include #include #include "MEM_guardedalloc.h" @@ -62,17 +63,6 @@ #include "../SHD_node.h" #include "node_util.h" -#include "BIF_gl.h" -#include "BIF_glutil.h" -#include "BIF_interface.h" -#include "BIF_interface_icons.h" -#include "BIF_language.h" -#include "BIF_mywindow.h" -#include "BIF_previewrender.h" -#include "BIF_resources.h" -#include "BIF_screen.h" -#include "BIF_space.h" - #include "BLI_arithb.h" #include "BLI_blenlib.h" #include "BLI_rand.h" @@ -81,15 +71,10 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "BSE_drawipo.h" -#include "BSE_node.h" -#include "BSE_view.h" - #include "RE_pipeline.h" #include "RE_shader_ext.h" #include "butspace.h" -#include "blendef.h" #include "mydevice.h" diff --git a/source/blender/radiosity/intern/source/radfactors.c b/source/blender/radiosity/intern/source/radfactors.c index 555438224e7..d6d07e5f55f 100644 --- a/source/blender/radiosity/intern/source/radfactors.c +++ b/source/blender/radiosity/intern/source/radfactors.c @@ -547,7 +547,7 @@ void progressiverad() applyformfactors(shoot); it++; - set_timecursor(it); + //XXX set_timecursor(it); if( (it & 3)==1 ) { make_node_display(); rad_forcedraw(); @@ -557,7 +557,7 @@ void progressiverad() clear_backface_test(); - if(blender_test_break()) break; + //XXX if(blender_test_break()) break; if(RG.maxiter && RG.maxiter<=it) break; shoot=findshootpatch(); @@ -673,7 +673,7 @@ void subdivideshootElements(int it) shoot= findshootpatch(); if(shoot==0) break; - set_timecursor(a); + //XXX set_timecursor(a); drawpatch_ext(shoot, 0x88FF00); setnodeflags(shoot->first, RAD_SHOOT, 1); @@ -723,7 +723,7 @@ void subdivideshootElements(int it) } else a--; - if(blender_test_break()) break; + //XXX if(blender_test_break()) break; } /* test for extreme small color change within a patch with subdivflag */ @@ -794,7 +794,7 @@ void subdivideshootElements(int it) } makeGlobalElemArray(); - if(contin==0 || blender_test_break()) break; + //XXX if(contin==0 || blender_test_break()) break; } make_node_display(); @@ -819,7 +819,7 @@ void subdivideshootPatches(int it) shoot= findshootpatch(); if(shoot==0) break; - set_timecursor(a); + //XXX set_timecursor(a); drawpatch_ext(shoot, 0x88FF00); setnodeflags(shoot->first, RAD_SHOOT, 1); @@ -869,7 +869,7 @@ void subdivideshootPatches(int it) setnodeflags(shoot->first, RAD_SHOOT, 0); - if(blender_test_break()) break; + //XXX if(blender_test_break()) break; } else a--; @@ -896,7 +896,7 @@ void subdivideshootPatches(int it) converttopatches(); makeGlobalElemArray(); - if(contin==0 || blender_test_break()) break; + //XXX if(contin==0 || blender_test_break()) break; } make_node_display(); } diff --git a/source/blender/radiosity/intern/source/radpreprocess.c b/source/blender/radiosity/intern/source/radpreprocess.c index 13c3477383c..2c3e750a450 100644 --- a/source/blender/radiosity/intern/source/radpreprocess.c +++ b/source/blender/radiosity/intern/source/radpreprocess.c @@ -316,7 +316,7 @@ void rad_collect_meshes() } if(G.obedit) { - if (!during_script()) error("Unable to perform function in EditMode"); + if (!during_script()); //XXX error("Unable to perform function in EditMode"); return; } @@ -341,7 +341,7 @@ void rad_collect_meshes() base= base->next; } if(RG.totvert==0) { - if (!during_script()) error("No vertices"); + if (!during_script()); //XXX error("No vertices"); return; } vnc= RG.verts= MEM_callocN(RG.totvert*sizeof(VeNoCo), "radioverts"); diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index eb5bb3f2f71..7a3a24f0fe6 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -31,7 +31,6 @@ #include #include -#include "blendef.h" #include "MTC_matrixops.h" #include "MEM_guardedalloc.h" diff --git a/source/blender/render/intern/source/pipeline.c b/source/blender/render/intern/source/pipeline.c index 0f9d4470164..5315552310a 100644 --- a/source/blender/render/intern/source/pipeline.c +++ b/source/blender/render/intern/source/pipeline.c @@ -62,8 +62,6 @@ #include "RE_pipeline.h" #include "radio.h" -#include "BSE_sequence.h" /* <----------------- bad!!! */ - #ifndef DISABLE_YAFRAY /* yafray: include for yafray export/render */ #include "YafRay_Api.h" @@ -2026,7 +2024,7 @@ static void do_render_all_options(Render *re) if(re->r.scemode & R_DOSEQ) { /* note: do_render_seq() frees rect32 when sequencer returns float images */ if(!re->test_break()) - do_render_seq(re->result, re->r.cfra); + ; //XXX do_render_seq(re->result, re->r.cfra); re->stats_draw(&re->i); re->display_draw(re->result, NULL); diff --git a/source/blender/windowmanager/intern/wm_subwindow.c b/source/blender/windowmanager/intern/wm_subwindow.c index a7217786138..2f4e90a2e71 100644 --- a/source/blender/windowmanager/intern/wm_subwindow.c +++ b/source/blender/windowmanager/intern/wm_subwindow.c @@ -231,7 +231,7 @@ void wm_subwindow_position(wmWindow *win, int swinid, rcti *winrct) /* ---------------- WM versions of OpenGL calls, using glBlah() syntax ------------------------ */ /* ----------------- exported in WM_api.h ------------------------------------------------------ */ -static int glaGetOneInteger(int a) +int glaGetOneInteger(int a) { return 0; // XXX } diff --git a/source/creator/creator.c b/source/creator/creator.c index c1783fb203b..89f79d8b843 100644 --- a/source/creator/creator.c +++ b/source/creator/creator.c @@ -46,8 +46,6 @@ #include "DNA_scene_types.h" #include "BLI_blenlib.h" -#include "blendef.h" /* for MAXFRAME */ - #include "BKE_utildefines.h" #include "BKE_blender.h" @@ -59,8 +57,6 @@ #include "BKE_scene.h" #include "BKE_node.h" -#include "BIF_drawscene.h" /* set_scene() */ - #include "IMB_imbuf.h" // for quicktime_init #include "BPY_extern.h" -- cgit v1.2.3