[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13089] branches/blender2.5/blender/source : removed blenderdef.h, BIF_*, BDR_* and BSE_* header files ( except for BIF_gl.h and BIF_glutil.h)
Campbell Barton
ideasman42 at gmail.com
Tue Jan 1 19:16:10 CET 2008
Revision: 13089
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13089
Author: campbellbarton
Date: 2008-01-01 19:16:10 +0100 (Tue, 01 Jan 2008)
Log Message:
-----------
removed blenderdef.h, BIF_*, BDR_* and BSE_* header files (except for BIF_gl.h and BIF_glutil.h)
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_scene.h
branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/font.c
branches/blender2.5/blender/source/blender/blenkernel/intern/image.c
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
branches/blender2.5/blender/source/blender/blenkernel/intern/lattice.c
branches/blender2.5/blender/source/blender/blenkernel/intern/library.c
branches/blender2.5/blender/source/blender/blenkernel/intern/material.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mesh.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires-firstlevel.c
branches/blender2.5/blender/source/blender/blenkernel/intern/multires.c
branches/blender2.5/blender/source/blender/blenkernel/intern/object.c
branches/blender2.5/blender/source/blender/blenkernel/intern/packedFile.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle.c
branches/blender2.5/blender/source/blender/blenkernel/intern/particle_system.c
branches/blender2.5/blender/source/blender/blenkernel/intern/pointcache.c
branches/blender2.5/blender/source/blender/blenkernel/intern/property.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
branches/blender2.5/blender/source/blender/blenkernel/intern/scene.c
branches/blender2.5/blender/source/blender/blenkernel/intern/screen.c
branches/blender2.5/blender/source/blender/blenkernel/intern/softbody.c
branches/blender2.5/blender/source/blender/blenkernel/intern/subsurf_ccg.c
branches/blender2.5/blender/source/blender/blenkernel/intern/text.c
branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c
branches/blender2.5/blender/source/blender/blenkernel/intern/verse_method.c
branches/blender2.5/blender/source/blender/blenkernel/intern/world.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeffmpeg.c
branches/blender2.5/blender/source/blender/blenkernel/intern/writeframeserver.c
branches/blender2.5/blender/source/blender/blenlib/BLI_storage_types.h
branches/blender2.5/blender/source/blender/blenlib/intern/bpath.c
branches/blender2.5/blender/source/blender/blenlib/intern/freetypefont.c
branches/blender2.5/blender/source/blender/blenloader/intern/readfile.c
branches/blender2.5/blender/source/blender/blenloader/intern/writefile.c
branches/blender2.5/blender/source/blender/makesdna/DNA_scene_types.h
branches/blender2.5/blender/source/blender/nodes/intern/CMP_util.h
branches/blender2.5/blender/source/blender/nodes/intern/SHD_util.h
branches/blender2.5/blender/source/blender/radiosity/intern/source/radfactors.c
branches/blender2.5/blender/source/blender/radiosity/intern/source/radpreprocess.c
branches/blender2.5/blender/source/blender/render/intern/source/convertblender.c
branches/blender2.5/blender/source/blender/render/intern/source/pipeline.c
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_subwindow.c
branches/blender2.5/blender/source/creator/creator.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/blenkernel/BKE_bad_level_calls.h
branches/blender2.5/blender/source/blender/editors/include/BDR_drawaction.h
branches/blender2.5/blender/source/blender/editors/include/BDR_drawmesh.h
branches/blender2.5/blender/source/blender/editors/include/BDR_drawobject.h
branches/blender2.5/blender/source/blender/editors/include/BDR_editcurve.h
branches/blender2.5/blender/source/blender/editors/include/BDR_editface.h
branches/blender2.5/blender/source/blender/editors/include/BDR_editmball.h
branches/blender2.5/blender/source/blender/editors/include/BDR_editobject.h
branches/blender2.5/blender/source/blender/editors/include/BDR_imagepaint.h
branches/blender2.5/blender/source/blender/editors/include/BDR_sculptmode.h
branches/blender2.5/blender/source/blender/editors/include/BDR_unwrapper.h
branches/blender2.5/blender/source/blender/editors/include/BDR_vpaint.h
branches/blender2.5/blender/source/blender/editors/include/BIF_butspace.h
branches/blender2.5/blender/source/blender/editors/include/BIF_cursors.h
branches/blender2.5/blender/source/blender/editors/include/BIF_drawimage.h
branches/blender2.5/blender/source/blender/editors/include/BIF_drawoops.h
branches/blender2.5/blender/source/blender/editors/include/BIF_drawscene.h
branches/blender2.5/blender/source/blender/editors/include/BIF_drawscript.h
branches/blender2.5/blender/source/blender/editors/include/BIF_drawseq.h
branches/blender2.5/blender/source/blender/editors/include/BIF_drawtext.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editaction.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editarmature.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editconstraint.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editdeform.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editfont.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editgroup.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editkey.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editlattice.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editmesh.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editmode_undo.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editnla.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editoops.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editparticle.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editsca.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editseq.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editsima.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editsound.h
branches/blender2.5/blender/source/blender/editors/include/BIF_editview.h
branches/blender2.5/blender/source/blender/editors/include/BIF_filelist.h
branches/blender2.5/blender/source/blender/editors/include/BIF_fsmenu.h
branches/blender2.5/blender/source/blender/editors/include/BIF_graphics.h
branches/blender2.5/blender/source/blender/editors/include/BIF_imasel.h
branches/blender2.5/blender/source/blender/editors/include/BIF_interface.h
branches/blender2.5/blender/source/blender/editors/include/BIF_interface_icons.h
branches/blender2.5/blender/source/blender/editors/include/BIF_keyval.h
branches/blender2.5/blender/source/blender/editors/include/BIF_language.h
branches/blender2.5/blender/source/blender/editors/include/BIF_mainqueue.h
branches/blender2.5/blender/source/blender/editors/include/BIF_meshlaplacian.h
branches/blender2.5/blender/source/blender/editors/include/BIF_meshtools.h
branches/blender2.5/blender/source/blender/editors/include/BIF_mywindow.h
branches/blender2.5/blender/source/blender/editors/include/BIF_oops.h
branches/blender2.5/blender/source/blender/editors/include/BIF_outliner.h
branches/blender2.5/blender/source/blender/editors/include/BIF_poseobject.h
branches/blender2.5/blender/source/blender/editors/include/BIF_previewrender.h
branches/blender2.5/blender/source/blender/editors/include/BIF_renderwin.h
branches/blender2.5/blender/source/blender/editors/include/BIF_resources.h
branches/blender2.5/blender/source/blender/editors/include/BIF_retopo.h
branches/blender2.5/blender/source/blender/editors/include/BIF_scrarea.h
branches/blender2.5/blender/source/blender/editors/include/BIF_screen.h
branches/blender2.5/blender/source/blender/editors/include/BIF_space.h
branches/blender2.5/blender/source/blender/editors/include/BIF_spacetypes.h
branches/blender2.5/blender/source/blender/editors/include/BIF_tbcallback.h
branches/blender2.5/blender/source/blender/editors/include/BIF_toets.h
branches/blender2.5/blender/source/blender/editors/include/BIF_toolbox.h
branches/blender2.5/blender/source/blender/editors/include/BIF_transform.h
branches/blender2.5/blender/source/blender/editors/include/BIF_usiblender.h
branches/blender2.5/blender/source/blender/editors/include/BIF_verse.h
branches/blender2.5/blender/source/blender/editors/include/BIF_writeavicodec.h
branches/blender2.5/blender/source/blender/editors/include/BIF_writeimage.h
branches/blender2.5/blender/source/blender/editors/include/BIF_writemovie.h
branches/blender2.5/blender/source/blender/editors/include/BSE_drawimasel.h
branches/blender2.5/blender/source/blender/editors/include/BSE_drawipo.h
branches/blender2.5/blender/source/blender/editors/include/BSE_drawnla.h
branches/blender2.5/blender/source/blender/editors/include/BSE_drawoops.h
branches/blender2.5/blender/source/blender/editors/include/BSE_drawview.h
branches/blender2.5/blender/source/blender/editors/include/BSE_edit.h
branches/blender2.5/blender/source/blender/editors/include/BSE_editaction_types.h
branches/blender2.5/blender/source/blender/editors/include/BSE_editipo.h
branches/blender2.5/blender/source/blender/editors/include/BSE_editipo_types.h
branches/blender2.5/blender/source/blender/editors/include/BSE_editnla_types.h
branches/blender2.5/blender/source/blender/editors/include/BSE_filesel.h
branches/blender2.5/blender/source/blender/editors/include/BSE_headerbuttons.h
branches/blender2.5/blender/source/blender/editors/include/BSE_node.h
branches/blender2.5/blender/source/blender/editors/include/BSE_seqaudio.h
branches/blender2.5/blender/source/blender/editors/include/BSE_seqeffects.h
branches/blender2.5/blender/source/blender/editors/include/BSE_seqscopes.h
branches/blender2.5/blender/source/blender/editors/include/BSE_sequence.h
branches/blender2.5/blender/source/blender/editors/include/BSE_time.h
branches/blender2.5/blender/source/blender/editors/include/BSE_trans_types.h
branches/blender2.5/blender/source/blender/editors/include/BSE_types.h
branches/blender2.5/blender/source/blender/editors/include/BSE_view.h
branches/blender2.5/blender/source/blender/editors/include/blendef.h
Deleted: branches/blender2.5/blender/source/blender/blenkernel/BKE_bad_level_calls.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_bad_level_calls.h 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_bad_level_calls.h 2008-01-01 18:16:10 UTC (rev 13089)
@@ -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
-
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_scene.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_scene.h 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_scene.h 2008-01-01 18:16:10 UTC (rev 13089)
@@ -41,6 +41,7 @@
struct QuicktimeCodecData;
/* sequence related defines */
+
#define WHILE_SEQ(base) { \
int totseq_, seq_; Sequence **seqar; \
build_seqar( base, &seqar, &totseq_); \
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/anim.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -68,8 +68,6 @@
#include "BKE_particle.h"
#include "BKE_utildefines.h"
-#include "BKE_bad_level_calls.h"
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
@@ -98,8 +96,8 @@
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;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -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"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -69,8 +69,6 @@
#include "BPY_extern.h"
-#include "blendef.h"
-
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/depsgraph.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -78,7 +78,6 @@
#include "BKE_scene.h"
#include "MEM_guardedalloc.h"
-#include "blendef.h"
#include "BPY_extern.h"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/displist.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -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 @@
float (*deformedVerts)[3];
if(!forRender && ob==G.obedit) {
- nubase= &editNurb;
+ //XXX nubase= &editNurb;
}
else {
nubase= &cu->nurb;
@@ -1396,7 +1395,7 @@
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));
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/effect.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -93,7 +93,7 @@
#include <string.h>
#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 @@
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;
}
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c 2008-01-01 16:14:08 UTC (rev 13088)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c 2008-01-01 18:16:10 UTC (rev 13089)
@@ -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 @@
MEM_freeN(facedata); \
fclose(fpSTL); \
sprintf(error_msg, "Problems reading face %d!", i); \
- error(error_msg); \
return; \
} \
else { \
@@ -245,7 +241,7 @@
fpSTL= fopen(str, "rb");
if(fpSTL==NULL) {
- error("Can't read file");
+ //XXX error("Can't read file");
return;
}
@@ -306,7 +302,7 @@
mesh_add_normals_flags(me);
make_edges(me, 0);
}
- waitcursor(1);
+ //XXX waitcursor(1);
}
fclose(fpSTL);
@@ -318,7 +314,6 @@
fclose(fpSTL); \
sprintf(error_msg, "Can't allocate storage for %d faces!", \
numtenthousand * 10000); \
- error(error_msg); \
return; \
}
@@ -327,7 +322,6 @@
fclose(fpSTL); \
free(vertdata); \
sprintf(error_msg, "Line %d: %s", linenum, message); \
- error(message); \
return; \
}
@@ -363,7 +357,7 @@
fpSTL= fopen(str, "r");
if(fpSTL==NULL) {
- error("Can't read file");
+ //XXX error("Can't read file");
return;
}
@@ -373,7 +367,7 @@
*/
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 @@
++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 @@
mesh_add_normals_flags(me);
make_edges(me, 0);
- waitcursor(1);
+ //XXX waitcursor(1);
}
#undef STLALLOCERROR
@@ -498,7 +492,7 @@
fp= fopen(str, "rb");
if(fp==NULL) {
- error("Can't read file");
+ //XXX error("Can't read file");
return;
}
@@ -507,12 +501,12 @@
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 @@
mesh_add_normals_flags(me);
make_edges(me, 0);
- waitcursor(1);
+ //XXX waitcursor(1);
}
static void read_radiogour(char *str)
@@ -704,7 +698,7 @@
fp= fopen(str, "rb");
if(fp==NULL) {
- error("Can't read file");
+ //XXX error("Can't read file");
return;
}
@@ -713,12 +707,12 @@
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 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list