diff options
-rw-r--r-- | source/blender/blenkernel/intern/blender.c | 45 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/exotic.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/sca.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/script.c | 8 | ||||
-rw-r--r-- | source/blender/blenlib/intern/fileops.c | 16 | ||||
-rw-r--r-- | source/blender/editors/screen/Makefile | 49 | ||||
-rw-r--r-- | source/blender/editors/screen/stubs.c | 45 | ||||
-rw-r--r-- | source/gameengine/BlenderRoutines/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Converter/Makefile | 2 | ||||
-rw-r--r-- | source/gameengine/Ketsji/Makefile | 2 | ||||
-rw-r--r-- | source/nan_compile.mk | 4 |
11 files changed, 117 insertions, 60 deletions
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index f09c1103922..0935a7161b0 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -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 @@ void initglobals(void) 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 @@ static void clear_global(void) G.sima= NULL; G.sipo= NULL; - free_vertexpaint(); - G.f &= ~(G_WEIGHTPAINT + G_VERTEXPAINT + G_FACESELECT + G_PARTICLEEDIT); } @@ -452,9 +447,6 @@ int BKE_read_file(bContext *C, char *dir, void *unused) 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 @@ int BKE_read_file(bContext *C, char *dir, void *unused) 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 @@ int BKE_read_file_from_memory(bContext *C, char* filebuf, int filelength, void * { 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 @@ int BKE_read_file_from_memfile(bContext *C, MemFile *memfile) 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); } diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index 0f1f8c6078a..3b6aa3bc1eb 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -2255,7 +2255,7 @@ static void displist_to_objects(ListBase *lbase) /* irst this: is still active */ if(ivsurf) { where_is_object(ivsurf); - docenter_new(); +// XXX docenter_new(); } dl= lbase->first; diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c index f368a30afb3..7dab2e51993 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -193,7 +193,7 @@ bSensor *new_sensor(int type) init_sensor(sens); strcpy(sens->name, "sensor"); - make_unique_prop_names(sens->name); +// XXX make_unique_prop_names(sens->name); return sens; } diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c index b99c2c51441..fda5cf89298 100644 --- a/source/blender/blenkernel/intern/script.c +++ b/source/blender/blenkernel/intern/script.c @@ -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). */ diff --git a/source/blender/blenlib/intern/fileops.c b/source/blender/blenlib/intern/fileops.c index fcea30982bd..94ed64d00d2 100644 --- a/source/blender/blenlib/intern/fileops.c +++ b/source/blender/blenlib/intern/fileops.c @@ -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> diff --git a/source/blender/editors/screen/Makefile b/source/blender/editors/screen/Makefile new file mode 100644 index 00000000000..302267be505 --- /dev/null +++ b/source/blender/editors/screen/Makefile @@ -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 diff --git a/source/blender/editors/screen/stubs.c b/source/blender/editors/screen/stubs.c new file mode 100644 index 00000000000..c9725e672f0 --- /dev/null +++ b/source/blender/editors/screen/stubs.c @@ -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() {} + + + diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index f0097e40807..036621fca74 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -48,7 +48,7 @@ CPPFLAGS += -I$(NAN_FUZZICS)/include 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 diff --git a/source/gameengine/Converter/Makefile b/source/gameengine/Converter/Makefile index 4ba34952d40..f4604f19dcb 100644 --- a/source/gameengine/Converter/Makefile +++ b/source/gameengine/Converter/Makefile @@ -50,7 +50,7 @@ CPPFLAGS += -I../../blender # these two needed because of blenkernel CPPFLAGS += -I../../blender/imbuf CPPFLAGS += -I../../blender/makesdna -CPPFLAGS += -I../../blender/include +CPPFLAGS += -I../../blender/editors/include CPPFLAGS += -I../../blender/blenlib CPPFLAGS += -I../../blender/blenkernel CPPFLAGS += -I../../blender/render/extern/include diff --git a/source/gameengine/Ketsji/Makefile b/source/gameengine/Ketsji/Makefile index f7813c80a59..29f4fee847b 100644 --- a/source/gameengine/Ketsji/Makefile +++ b/source/gameengine/Ketsji/Makefile @@ -60,7 +60,7 @@ CPPFLAGS += -I. CPPFLAGS += -I../Converter CPPFLAGS += -I../../blender/blenkernel CPPFLAGS += -I../../blender/blenlib -CPPFLAGS += -I../../blender/include +CPPFLAGS += -I../../blender/editors/include CPPFLAGS += -I../../blender/makesdna CPPFLAGS += -I../../blender/imbuf CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include diff --git a/source/nan_compile.mk b/source/nan_compile.mk index a5f0dccce35..5946a1d4f06 100644 --- a/source/nan_compile.mk +++ b/source/nan_compile.mk @@ -87,8 +87,8 @@ ifeq ($(OS),darwin) CFLAGS += -pipe -fPIC -ffast-math -march=pentium-m -funsigned-char -fno-strict-aliasing CCFLAGS += -pipe -fPIC -funsigned-char -fno-strict-aliasing endif - REL_CFLAGS += -O2 - REL_CCFLAGS += -O2 +# REL_CFLAGS += -O2 +# REL_CCFLAGS += -O2 CPPFLAGS += -D_THREAD_SAFE NAN_DEPEND = true OPENGL_HEADERS = /System/Library/Frameworks/OpenGL.framework |