[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13043] branches/blender2.5/blender/source : Cleanup work for 2.5 branch.
Ton Roosendaal
ton at blender.org
Sat Dec 29 15:31:26 CET 2007
Revision: 13043
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13043
Author: ton
Date: 2007-12-29 15:31:26 +0100 (Sat, 29 Dec 2007)
Log Message:
-----------
Cleanup work for 2.5 branch. Target is to get it compile and link
still!
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
branches/blender2.5/blender/source/blender/blenkernel/intern/script.c
branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
branches/blender2.5/blender/source/gameengine/Converter/Makefile
branches/blender2.5/blender/source/gameengine/Ketsji/Makefile
branches/blender2.5/blender/source/nan_compile.mk
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/screen/
branches/blender2.5/blender/source/blender/editors/screen/Makefile
branches/blender2.5/blender/source/blender/editors/screen/stubs.c
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c 2007-12-29 10:47:16 UTC (rev 13042)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c 2007-12-29 14:31:26 UTC (rev 13043)
@@ -83,7 +83,6 @@
#include "BLO_readfile.h"
#include "BLO_writefile.h"
-#include "BKE_bad_level_calls.h" // for freeAllRad editNurb free_editMesh free_editText free_editArmature
#include "BKE_utildefines.h" // O_BINARY FALSE
#include "BIF_mainqueue.h" // mainqenter for onload script
#include "mydevice.h"
@@ -238,21 +237,19 @@
static void clear_global(void)
{
- extern short winqueue_break; /* screen.c */
+// extern short winqueue_break; /* screen.c */
- freeAllRad();
+// XXX freeAllRad();
fastshade_free_render(); /* lamps hang otherwise */
free_main(G.main); /* free all lib data */
-
- /* force all queues to be left */
- winqueue_break= 1;
if (G.obedit) {
- freeNurblist(&editNurb);
- free_editMesh(G.editMesh);
- free_editText();
- free_editArmature();
+// freeNurblist(&editNurb);
+// free_editMesh(G.editMesh);
+// free_editText();
+// free_editArmature();
}
+// free_vertexpaint();
G.curscreen= NULL;
G.scene= NULL;
@@ -267,8 +264,6 @@
G.sima= NULL;
G.sipo= NULL;
- free_vertexpaint();
-
G.f &= ~(G_WEIGHTPAINT + G_VERTEXPAINT + G_FACESELECT + G_PARTICLEEDIT);
}
@@ -452,9 +447,6 @@
BlendFileData *bfd;
int retval= 1;
- if (!G.background)
- waitcursor(1);
-
bfd= BLO_read_from_file(dir, &bre);
if (bfd) {
if(bfd->user) retval= 2;
@@ -466,10 +458,7 @@
else {
error("Loading %s failed: %s", dir, BLO_bre_as_string(bre));
}
-
- if (!G.background)
- waitcursor(0);
-
+
return (bfd?retval:0);
}
@@ -477,20 +466,14 @@
{
BlendReadError bre;
BlendFileData *bfd;
-
- if (!G.background)
- waitcursor(1);
-
+
bfd= BLO_read_from_memory(filebuf, filelength, &bre);
if (bfd) {
setup_app_data(C, bfd, "<memory>");
} else {
error("Loading failed: %s", BLO_bre_as_string(bre));
}
-
- if (!G.background)
- waitcursor(0);
-
+
return (bfd?1:0);
}
@@ -500,19 +483,13 @@
BlendReadError bre;
BlendFileData *bfd;
- if (!G.background)
- waitcursor(1);
-
bfd= BLO_read_from_memfile(G.sce, memfile, &bre);
if (bfd) {
setup_app_data(C, bfd, "<memory>");
} else {
error("Loading failed: %s", BLO_bre_as_string(bre));
}
-
- if (!G.background)
- waitcursor(0);
-
+
return (bfd?1:0);
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c 2007-12-29 10:47:16 UTC (rev 13042)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/exotic.c 2007-12-29 14:31:26 UTC (rev 13043)
@@ -2255,7 +2255,7 @@
/* irst this: is still active */
if(ivsurf) {
where_is_object(ivsurf);
- docenter_new();
+// XXX docenter_new();
}
dl= lbase->first;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2007-12-29 10:47:16 UTC (rev 13042)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/sca.c 2007-12-29 14:31:26 UTC (rev 13043)
@@ -193,7 +193,7 @@
init_sensor(sens);
strcpy(sens->name, "sensor");
- make_unique_prop_names(sens->name);
+// XXX make_unique_prop_names(sens->name);
return sens;
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/script.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/script.c 2007-12-29 10:47:16 UTC (rev 13042)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/script.c 2007-12-29 14:31:26 UTC (rev 13043)
@@ -38,9 +38,8 @@
#include "BPI_script.h"
#include "MEM_guardedalloc.h"
-#include "BKE_bad_level_calls.h" /* for BPY_clear_script */
-/*
+
#include "BLI_blenlib.h"
#include "BKE_utildefines.h"
#include "BKE_library.h"
@@ -49,11 +48,6 @@
#include "BPY_extern.h" // Blender Python library
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-*/
-
/* XXX this function and so also the file should not be needed anymore,
* since we have to force clearing all Python related data before freeing
* Blender's library. Still testing, will decide later (Willian). */
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c 2007-12-29 10:47:16 UTC (rev 13042)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/fileops.c 2007-12-29 14:31:26 UTC (rev 13043)
@@ -1,21 +1,12 @@
/*
- * blenlib/fileops.h
- *
- * cleaned up (a bit) mar-01 nzc
- *
- * More low-level file things.
- *
* $Id$
*
- * ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
+ * ***** 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.
+ * 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
@@ -33,12 +24,13 @@
*
* Contributor(s): none yet.
*
- * ***** END GPL/BL DUAL LICENSE BLOCK *****
+ * ***** END GPL LICENSE BLOCK *****
*/
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
+#include <unistd.h>
#ifdef HAVE_CONFIG_H
#include <config.h>
Added: branches/blender2.5/blender/source/blender/editors/screen/Makefile
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/Makefile (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/screen/Makefile 2007-12-29 14:31:26 UTC (rev 13043)
@@ -0,0 +1,49 @@
+#
+# $Id: Makefile 14 2002-10-13 15:57:19Z hans $
+#
+# ***** 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) 2007 Blender Foundation
+# All rights reserved.
+#
+# The Original Code is: all of this file.
+#
+# Contributor(s): none yet.
+#
+# ***** END GPL LICENSE BLOCK *****
+#
+# Makes module object directory and bounces make to subdirectories.
+
+LIBNAME = editors_datafiles
+DIR = $(OCGDIR)/blender/$(LIBNAME)
+
+include nan_compile.mk
+
+CFLAGS += $(LEVEL_1_C_WARNINGS)
+
+CPPFLAGS += -I$(OPENGL_HEADERS)
+
+# not very neat....
+CPPFLAGS += -I../../../blenkernel
+CPPFLAGS += -I../../../blenlib
+CPPFLAGS += -I../../../makesdna
+CPPFLAGS += -I../../../imbuf
+CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
+
+# own include
+
+CPPFLAGS += -I../include
Added: branches/blender2.5/blender/source/blender/editors/screen/stubs.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/stubs.c (rev 0)
+++ branches/blender2.5/blender/source/blender/editors/screen/stubs.c 2007-12-29 14:31:26 UTC (rev 13043)
@@ -0,0 +1,45 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+#include <string.h>
+
+void blender_test_break() {}
+void do_render_seq() {}
+void allqueue() {}
+void error() {}
+
+void *curarea;
+
+/* blenkernel errors */
+void copy_view3d_lock() {}
+void PE_recalc_world_cos() {}
+
+void BPY_clear_script() {}
+
+
+
Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile 2007-12-29 10:47:16 UTC (rev 13042)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile 2007-12-29 14:31:26 UTC (rev 13043)
@@ -48,7 +48,7 @@
CPPFLAGS += -I$(NAN_SOUNDSYSTEM)/include
# because of kernel dependency on makesdna
CPPFLAGS += -I../../blender/makesdna
-CPPFLAGS += -I../../blender/include
+CPPFLAGS += -I../../blender/editors/include
# because of kernel dependency on imbuf
CPPFLAGS += -I../../blender/imbuf
CPPFLAGS += -I../../blender/blenlib
Modified: branches/blender2.5/blender/source/gameengine/Converter/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/Converter/Makefile 2007-12-29 10:47:16 UTC (rev 13042)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list