diff options
Diffstat (limited to 'source/blender/blenkernel')
69 files changed, 614 insertions, 1159 deletions
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 0b623526562..00000000000 --- a/source/blender/blenkernel/BKE_bad_level_calls.h +++ /dev/null @@ -1,234 +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 LICENSE BLOCK ***** - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License - * as published by the Free Software Foundation; either version 2 - * of the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - */ -#ifndef BKE_BAD_LEVEL_CALLS_H -#define BKE_BAD_LEVEL_CALLS_H - -/* blender.c */ -void freeAllRad(void); -void free_editText(void); -void free_vertexpaint(void); - -/* readfile.c */ -struct SpaceButs; -void set_rects_butspace(struct SpaceButs *buts); -struct SpaceImaSel; -void check_imasel_copy(struct SpaceImaSel *simasel); -struct ScrArea; -struct bScreen; -void unlink_screen(struct bScreen *sc); -void setscreen(struct bScreen *sc); -void force_draw_all(int); - /* otherwise the WHILE_SEQ doesn't work */ -struct Sequence; -struct ListBase; -void build_seqar(struct ListBase *seqbase, struct Sequence ***seqar, int *totseq); - -/* BPython API */ -struct ID; -struct Script; -struct Text; -struct IpoDriver; /* DNA_curve_types.h */ -struct Object; -struct PyObject; -struct Node_Type; -struct BPy_Node; -struct bNode; -struct bNodeStack; -struct ShadeInput; -struct bPythonConstraint; -struct bConstraintOb; -struct bConstraintTarget; -void BPY_do_pyscript (struct ID *id, short int event); -void BPY_clear_script (struct Script *script); -void BPY_free_compiled_text (struct Text *text); -/* pydrivers */ -struct Object **BPY_pydriver_get_objects(struct IpoDriver *driver); -float BPY_pydriver_eval(struct IpoDriver *driver); -void BPY_pydriver_update(void); -/* button python evaluation */ -int BPY_button_eval(char *expr, double *value); -/* pyconstraints */ -void BPY_pyconstraint_eval(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets); -void BPY_pyconstraint_targets(struct bPythonConstraint *con, struct bConstraintTarget *ct); -/* pynodes */ -int EXPP_dict_set_item_str(struct PyObject *dict, char *key, struct PyObject *value); -void Node_SetStack(struct BPy_Node *self, struct bNodeStack **stack, int type); -void InitNode(struct BPy_Node *self, struct bNode *node); -void Node_SetShi(struct BPy_Node *self, struct ShadeInput *shi); -struct BPy_NodeSockets *Node_CreateSocketLists(struct bNode *node); -int pytype_is_pynode(struct PyObject *pyob); -/* writefile.c */ -struct Oops; -void free_oops(struct Oops *oops); -void error(char *str, ...); - -/* anim.c */ -extern struct ListBase editNurb; - -void mainqenter (unsigned short event, short val); -void waitcursor(int); -void allqueue(unsigned short event, short val); -#define REDRAWVIEW3D 0x4010 -#define REDRAWBUTSOBJECT 0x4018 -#define REDRAWBUTSEDIT 0x4019 -struct Material; -extern struct Material defmaterial; - - -/* exotic.c */ -void load_editMesh(void); -void make_editMesh(void); -struct EditMesh; -void free_editMesh(struct EditMesh *); -void free_editArmature(void); -void docenter_new(void); -int saveover(char *str); - -/* ipo.c */ -void copy_view3d_lock(short val); // was a hack, to make scene layer ipo's possible - -/* library.c */ -void allspace(unsigned short event, short val) ; -#define OOPS_TEST 2 - -/* mball.c */ -extern struct ListBase editelems; - -/* object.c */ -struct ScriptLink; -void BPY_free_scriptlink(struct ScriptLink *slink); -void BPY_copy_scriptlink(struct ScriptLink *scriptlink); -float *give_cursor(void); // become a callback or argument -void exit_posemode(int freedata); - -/* packedFile.c */ -short pupmenu(char *instr); // will be general callback - -/* sca.c */ -#define LEFTMOUSE 0x001 // because of mouse sensor - -/* scene.c */ -#include "DNA_sequence_types.h" -void free_editing(struct Editing *ed); // scenes and sequences problem... -void BPY_do_all_scripts (short int event, short int anim); -int BPY_call_importloader(char *name); - - -extern char texstr[20][12]; /* buttons.c */ - - -/* editsca.c */ -void make_unique_prop_names(char *str); - -/* DerivedMesh.c */ -void bglBegin(int mode); -void bglVertex3fv(float *vec); -void bglVertex3f(float x, float y, float z); -void bglEnd(void); - -struct Object; - -/* booleanops.c */ -struct DerivedMesh *NewBooleanDerivedMesh(struct Object *ob, - struct Object *ob_select, int int_op_type); - -/* verse_*.c */ -struct VerseVert; -struct VerseFace; -struct VerseSession; -struct VNode; -struct VTag; -struct VTagGroup; -struct VBitmapLayer; -struct VLink; -struct VLayer; -struct Mesh; - -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_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_polygon_set_uint8(struct VerseFace *vface); -void post_node_create(struct VNode *vnode); -void post_node_destroy(struct VNode *vnode); -void post_node_name_set(struct VNode *vnode); -void post_tag_change(struct VTag *vtag); -void post_taggroup_create(struct VTagGroup *vtaggroup); -char *verse_client_name(void); -void post_transform(struct VNode *vnode); -void post_transform_pos(struct VNode *vnode); -void post_transform_rot(struct VNode *vnode); -void post_transform_scale(struct VNode *vnode); -void post_object_free_constraint(struct VNode *vnode); -void post_link_set(struct VLink *vlink); -void post_link_destroy(struct VLink *vlink); -void post_connect_accept(struct VerseSession *session); -void post_connect_terminated(struct VerseSession *session); -void post_connect_update(struct VerseSession *session); -void add_screenhandler(struct bScreen *sc, short eventcode, short val); -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); -void create_meshdata_from_geom_node(struct Mesh *me, struct VNode *vnode); -void post_geometry_free_constraint(struct VNode *vnode); -void post_layer_create(struct VLayer *vlayer); -void post_layer_destroy(struct VLayer *vlayer); -void post_server_add(void); - -/* zbuf.c */ -void antialias_tagbuf(int xsize, int ysize, char *rectmove); - -/* imagetexture.c */ -void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float *result); - -/* modifier.c */ -struct MeshDeformModifierData; - -void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd, - float (*vertexcos)[3], int totvert, float cagemat[][4]); - -/* particle.c */ -struct ParticleSystem; - -void PE_free_particle_edit(struct ParticleSystem *psys); -void PE_get_colors(char sel[4], char nosel[4]); -void PE_recalc_world_cos(struct Object *ob, struct ParticleSystem *psys); - -#endif - diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index f392d57521c..5eb3de4404e 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -39,18 +39,18 @@ extern "C" { struct ListBase; struct MemFile; +struct bContext; -#define BLENDER_VERSION 248 -#define BLENDER_SUBVERSION 1 +#define BLENDER_VERSION 250 +#define BLENDER_SUBVERSION 0 -#define BLENDER_MINVERSION 245 -#define BLENDER_MINSUBVERSION 15 +#define BLENDER_MINVERSION 250 +#define BLENDER_MINSUBVERSION 0 -int BKE_read_file(char *dir, void *type_r); -int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r); -int BKE_read_file_from_memfile(struct MemFile *memfile); +int BKE_read_file(struct bContext *C, char *dir, void *type_r); +int BKE_read_file_from_memory(struct bContext *C, char* filebuf, int filelength, void *type_r); +int BKE_read_file_from_memfile(struct bContext *C, struct MemFile *memfile); -void duplicatelist(struct ListBase *list1, struct ListBase *list2); void free_blender(void); void initglobals(void); @@ -61,11 +61,11 @@ void free_pushpop(void); void pushpop_test(void); /* global undo */ -extern void BKE_write_undo(char *name); -extern void BKE_undo_step(int step); +extern void BKE_write_undo(struct bContext *C, char *name); +extern void BKE_undo_step(struct bContext *C, int step); extern void BKE_reset_undo(void); extern char *BKE_undo_menu_string(void); -extern void BKE_undo_number(int nr); +extern void BKE_undo_number(struct bContext *C, int nr); extern void BKE_undo_save_quit(void); #ifdef __cplusplus diff --git a/source/blender/blenkernel/BKE_bmesh.h b/source/blender/blenkernel/BKE_bmesh.h index 8ec7144faf6..71c042e34fe 100644 --- a/source/blender/blenkernel/BKE_bmesh.h +++ b/source/blender/blenkernel/BKE_bmesh.h @@ -44,7 +44,7 @@ #include "DNA_image_types.h" #include "BLI_editVert.h" #include "BKE_DerivedMesh.h" -#include "transform.h" +//XXX #include "transform.h" /*forward declerations*/ struct BME_Vert; diff --git a/source/blender/blenkernel/BKE_font.h b/source/blender/blenkernel/BKE_font.h index 33747eb35a3..3f6b295b9ba 100644 --- a/source/blender/blenkernel/BKE_font.h +++ b/source/blender/blenkernel/BKE_font.h @@ -41,6 +41,7 @@ struct VFont; struct Object; struct Curve; struct objfnt; +struct TmpFont; struct chartrans { float xof, yof; @@ -58,7 +59,9 @@ extern struct SelBox *selboxes; void BKE_font_register_builtin(void *mem, int size); void free_vfont(struct VFont *sc); +void free_ttfont(void); struct VFont *load_vfont(char *name); +struct TmpFont *vfont_find_tmpfont(struct VFont *vfont); struct chartrans *text_to_curve(struct Object *ob, int mode); int style_to_sel(int style, int toggle); diff --git a/source/blender/blenkernel/BKE_global.h b/source/blender/blenkernel/BKE_global.h index 3a2dca525b8..498fd6169b2 100644 --- a/source/blender/blenkernel/BKE_global.h +++ b/source/blender/blenkernel/BKE_global.h @@ -55,12 +55,35 @@ struct SpaceNla; struct Main; struct Scene; struct bScreen; +struct ScrArea; +struct ARegion; struct Object; struct bSoundListener; struct BMF_Font; struct EditMesh; struct BME_Glob; +/* former global stuff. context is derived, not storage! */ +typedef struct bContext { + + /* windowmanager tree context */ + struct wmWindowManager *wm; + struct wmWindow *window; + struct bScreen *screen; + struct ScrArea *area; + struct ARegion *region; + + /* data context */ + struct Scene *scene; + struct Object *obact; + struct Object *obedit; + + /* edit data context */ + struct EditMesh *editMesh; + struct ListBase edbo; /* Armature Editmode bones */ + +} bContext; + typedef struct Global { /* active pointers */ @@ -121,7 +144,7 @@ typedef struct Global { /* Reevan's __NLA variables */ struct ListBase edbo; /* Armature Editmode bones */ - /* Rob's variables */ + /* Rob's variables (keep here for WM recode) */ int have_quicktime; int ui_international; int charstart; diff --git a/source/blender/blenkernel/BKE_library.h b/source/blender/blenkernel/BKE_library.h index d840401d4fa..212e9f08c35 100644 --- a/source/blender/blenkernel/BKE_library.h +++ b/source/blender/blenkernel/BKE_library.h @@ -37,6 +37,8 @@ struct ListBase; struct ID; struct Main; struct Library; +struct wmWindowManager; +struct bContext; void *alloc_libblock(struct ListBase *lb, short type, const char *name); void *copy_libblock(void *rt); @@ -70,5 +72,7 @@ void IPOnames_to_pupstring(char **str, char *title, char *extraops, struct ListB void flag_listbase_ids(ListBase *lb, short flag, short value); void flag_all_listbases_ids(short flag, short value); +void set_free_windowmanager_cb(void (*func)(struct bContext *, struct wmWindowManager *) ); + #endif diff --git a/source/blender/blenkernel/BKE_main.h b/source/blender/blenkernel/BKE_main.h index d1cc7515159..34ecb2bbba1 100644 --- a/source/blender/blenkernel/BKE_main.h +++ b/source/blender/blenkernel/BKE_main.h @@ -76,6 +76,7 @@ typedef struct Main { ListBase nodetree; ListBase brush; ListBase particle; + ListBase wm; } Main; diff --git a/source/blender/blenkernel/BKE_scene.h b/source/blender/blenkernel/BKE_scene.h index 2bd528ab8c8..35168cb65f2 100644 --- a/source/blender/blenkernel/BKE_scene.h +++ b/source/blender/blenkernel/BKE_scene.h @@ -41,6 +41,7 @@ struct SculptData; struct RenderData; /* sequence related defines */ + #define WHILE_SEQ(base) { \ int totseq_, seq_; Sequence **seqar; \ build_seqar( base, &seqar, &totseq_); \ diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h index df904d3e08a..129093f6078 100644 --- a/source/blender/blenkernel/BKE_screen.h +++ b/source/blender/blenkernel/BKE_screen.h @@ -31,7 +31,70 @@ #ifndef BKE_SCREEN_H #define BKE_SCREEN_H +struct SpaceType; +struct ScrArea; +struct bScreen; +struct ARegion; +struct wmNotifier; +struct wmWindowManager; +struct ListBase; + +/* spacetype has everything stored to get an editor working, it gets initialized via +spacetypes_init() in editors/area/spacetypes.c */ +/* an editor in Blender is a combined ScrArea + SpaceType + SpaceData */ + +typedef struct SpaceType { + struct SpaceType *next, *prev; + + char name[32]; /* for menus */ + int spaceid; /* unique space identifier */ + int iconid; /* icon lookup for menus */ + + /* calls init too */ + struct SpaceLink *(*new)(void); + /* not free spacelink itself */ + void (*free)(struct SpaceLink *); + + /* init is to cope with internal contextual changes, adds handlers, + * sets screarea regions */ + void (*init)(struct wmWindowManager *, struct ScrArea *); + /* refresh is for external bContext changes */ + void (*refresh)(struct bContext *, struct ScrArea *); + + /* after a spacedata copy, an init should result in exact same situation */ + struct SpaceLink *(*duplicate)(struct SpaceLink *); + + /* register operator types on startup */ + void (*operatortypes)(void); + /* add default items to keymap */ + void (*keymap)(struct wmWindowManager *); + + /* read and write... */ + +} SpaceType; + +/* region type gets allocated and freed in spacetype init/free callback */ +/* data storage for regions is in space struct (also width/height of regions!) */ +typedef struct ARegionType { + + void (*init)(const struct bContext *, struct ARegion *); /* add handlers, stuff you only do once or on area/region changes */ + void (*refresh)(const struct bContext *, struct ARegion *); /* refresh to match contextual changes */ + void (*draw)(const struct bContext *, struct ARegion *); /* draw entirely, windowsize changes should be handled here */ + + void (*listener)(struct ARegion *, struct wmNotifier *); + void (*free)(struct ARegion *); +} ARegionType; + + +void BKE_screen_area_free(struct ScrArea *sa); +void BKE_area_region_free(struct ARegion *ar); void free_screen(struct bScreen *sc); +struct SpaceType *BKE_spacetype_from_id(int spaceid); +const struct ListBase *BKE_spacetypes_list(void); +void BKE_spacetype_register(struct SpaceType *st); +void BKE_spacedata_freelist(ListBase *lb); +void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2); + #endif diff --git a/source/blender/blenkernel/CMakeLists.txt b/source/blender/blenkernel/CMakeLists.txt index 0ed4f38e457..4c6d5717591 100644 --- a/source/blender/blenkernel/CMakeLists.txt +++ b/source/blender/blenkernel/CMakeLists.txt @@ -27,7 +27,7 @@ FILE(GLOB SRC intern/*.c) SET(INC - . ../../../intern/guardedalloc ../include ../blenlib ../makesdna + . ../../../intern/guardedalloc ../editors/include ../blenlib ../makesdna ../python ../render/extern/include ../../../intern/decimation/extern ../imbuf ../avi ../../../intern/elbeem/extern ../../../intern/opennl/extern ../../../intern/iksolver/extern ../blenloader ../quicktime diff --git a/source/blender/blenkernel/Makefile b/source/blender/blenkernel/Makefile index a5ee729b7e3..f0476bbf026 100644 --- a/source/blender/blenkernel/Makefile +++ b/source/blender/blenkernel/Makefile @@ -29,6 +29,6 @@ # Bounces make to subdirectories. SOURCEDIR = source/blender/blenkernel -DIRS = intern bad_level_call_stubs +DIRS = intern include nan_subdirs.mk diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript index ab122e40bfc..071fd5d82d9 100644 --- a/source/blender/blenkernel/SConscript +++ b/source/blender/blenkernel/SConscript @@ -3,7 +3,7 @@ Import ('env') sources = env.Glob('intern/*.c') -incs = '. #/intern/guardedalloc ../include ../blenlib ../makesdna' +incs = '. #/intern/guardedalloc ../editors/include ../blenlib ../makesdna' incs += ' ../render/extern/include #/intern/decimation/extern' incs += ' ../imbuf ../avi #/intern/elbeem/extern ../nodes' incs += ' #/intern/iksolver/extern ../blenloader' diff --git a/source/blender/blenkernel/bad_level_call_stubs/CMakeLists.txt b/source/blender/blenkernel/bad_level_call_stubs/CMakeLists.txt deleted file mode 100644 index 7574f13c92e..00000000000 --- a/source/blender/blenkernel/bad_level_call_stubs/CMakeLists.txt +++ /dev/null @@ -1,43 +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 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, Blender Foundation -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): Jacques Beaurain. -# -# ***** END GPL LICENSE BLOCK ***** - -FILE(GLOB SRC stubs.c) - -SET(INC - . - .. - ../../render/extern/include - ../../../intern/iksolver/extern - ../../blenlib - ../../include - ../../makesdna -) - -IF(WITH_INTERNATIONAL) - ADD_DEFINITIONS(-DWITH_FREETYPE2) -ENDIF(WITH_INTERNATIONAL) - -BLENDERLIB_NOLIST(blenkernel_blc "${SRC}" "${INC}") diff --git a/source/blender/blenkernel/bad_level_call_stubs/Makefile b/source/blender/blenkernel/bad_level_call_stubs/Makefile deleted file mode 100644 index 5268bfd8a48..00000000000 --- a/source/blender/blenkernel/bad_level_call_stubs/Makefile +++ /dev/null @@ -1,48 +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 option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software Foundation, -# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -# -# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. -# All rights reserved. -# -# The Original Code is: all of this file. -# -# Contributor(s): none yet. -# -# ***** END GPL LICENSE BLOCK ***** -# -# - -LIBNAME = blenkernel_blc -DIR = $(OCGDIR)/blender/blenkernel/$(LIBNAME) - -include nan_compile.mk - -CFLAGS += $(LEVEL_2_C_WARNINGS) -CFLAGS += $(FIX_STUBS_WARNINGS) - -CPPFLAGS += $(OGL_CPPFLAGS) -CPPFLAGS += -I../../makesdna -CPPFLAGS += -I../../include -CPPFLAGS += -I../../blenlib -CPPFLAGS += -I../../render/extern/include -CPPFLAGS += -I$(NAN_IKSOLVER)/include - -# path to our own external headerfiles -CPPFLAGS += -I.. - diff --git a/source/blender/blenkernel/bad_level_call_stubs/SConscript b/source/blender/blenkernel/bad_level_call_stubs/SConscript deleted file mode 100644 index 955a989c9f9..00000000000 --- a/source/blender/blenkernel/bad_level_call_stubs/SConscript +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/python -Import ('env') - -sources = 'stubs.c' - -incs = '. .. ../../render/extern/include' -incs += ' #/intern/iksolver/extern ../../blenlib' -incs += ' ../../include ../../makesdna' - -defs = '' -if env['WITH_BF_INTERNATIONAL']: - defs += 'WITH_FREETYPE2' - -env.BlenderLib ('blenkernel_blc', sources = Split(sources), includes=Split(incs), defines=Split(defs), libtype='player',priority=225 ) diff --git a/source/blender/blenkernel/bad_level_call_stubs/stubs.c b/source/blender/blenkernel/bad_level_call_stubs/stubs.c deleted file mode 100644 index ae336d0fc26..00000000000 --- a/source/blender/blenkernel/bad_level_call_stubs/stubs.c +++ /dev/null @@ -1,349 +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 option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software Foundation, - * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV. - * All rights reserved. - * - * The Original Code is: all of this file. - * - * Contributor(s): none yet. - * - * ***** END GPL LICENSE BLOCK ***** - * BKE_bad_level_calls function stubs - */ - -#include <stdlib.h> - -#include "BKE_bad_level_calls.h" -#include "BLI_blenlib.h" -#include "DNA_space_types.h" -#include "DNA_texture_types.h" -#include "DNA_material_types.h" -#include "DNA_node_types.h" -#include "DNA_scene_types.h" - -#include "RE_render_ext.h" -#include "RE_shader_ext.h" -#include "RE_pipeline.h" - -int winqueue_break= 0; - -char bprogname[1]; -char btempdir[1]; - -struct IpoCurve; -struct FluidsimSettings; -struct Render; -struct RenderResult; -struct Object; -struct bPythonConstraint; -struct bConstraintOb; -struct bConstraintTarget; -struct ListBase; -struct EditFace; - -char *getIpoCurveName( struct IpoCurve * icu ); -void insert_vert_icu(struct IpoCurve *icu, float x, float y, short fast); -struct IpoCurve *verify_ipocurve(struct ID *id, short a, char *b, char *d, int e, short f); -void elbeemDebugOut(char *msg); -void fluidsimSettingsFree(struct FluidsimSettings* sb); -void fluidsimSettingsCopy(struct FluidsimSettings* sb); - - -/* readfile.c */ - /* struct SpaceButs; */ -void set_rects_butspace(struct SpaceButs *buts){} - /* struct SpaceImaSel; */ -void check_imasel_copy(struct SpaceImaSel *simasel){} - /* struct ScrArea; */ -void unlink_screen(struct bScreen *sc){} -void freeAllRad(void){} -void free_editText(void){} -void free_editArmature(void){} -void free_vertexpaint(void){} - -char *getIpoCurveName( struct IpoCurve * icu ) -{ - return 0; -} - -void insert_vert_icu(struct IpoCurve *icu, float x, float y, short fast) -{ -} - - -struct IpoCurve *verify_ipocurve(struct ID *id, short a, char *b, char *d, int e, short f) -{ - return 0; -} - - -void setscreen(struct bScreen *sc){} -void force_draw_all(int header){} - /* otherwise the WHILE_SEQ doesn't work */ - /* struct Sequence; */ - -/* MAART: added "seqar = 0; totseq = 0" because the loader will crash without it. */ -void build_seqar(struct ListBase *seqbase, struct Sequence ***seqar, int *totseq) -{ - *seqar = 0; - *totseq = 0; -} - -/* blender.c */ -void mainqenter (unsigned short event, short val){} - -void BPY_do_pyscript(ID *id, short int event){} -void BPY_clear_script(Script *script){} -void BPY_free_compiled_text(struct Text *text){} -void BPY_pydriver_update(void){} -float BPY_pydriver_eval(struct IpoDriver *driver) -{ - return 0; -} - -/* -int EXPP_dict_set_item_str(struct PyObject *dict, char *key, struct PyObject *value) -{ - return 0; -} -*/ - -void Node_SetStack(struct BPy_Node *self, struct bNodeStack **stack, int type){} -void InitNode(struct BPy_Node *self, struct bNode *node){} -void Node_SetShi(struct BPy_Node *self, struct ShadeInput *shi){} -struct BPy_NodeSockets *Node_CreateSocketLists(struct bNode *node) -{ - return 0; -} -int pytype_is_pynode(struct PyObject *pyob) -{ - return 0; -} -/* depsgraph.c: */ -struct Object **BPY_pydriver_get_objects(struct IpoDriver *driver) -{ - return 0; -} -int BPY_button_eval(char *expr, double *value) -{ - return 0; -} - -/* PyConstraints - BPY_interface.c */ -void BPY_pyconstraint_eval(struct bPythonConstraint *con, struct bConstraintOb *cob, struct ListBase *targets) -{ -} -void BPY_pyconstraint_target(struct bPythonConstraint *con, struct bConstraintTarget *ct) -{ -} - - -/* writefile.c */ - /* struct Oops; */ -void free_oops(struct Oops *oops){} -void exit_posemode(int freedata){} -void error(char *str, ...){} - -/* anim.c */ -ListBase editNurb; - -void waitcursor(int val){} -void allqueue(unsigned short event, short val){} -#define REDRAWVIEW3D 0x4010 -Material defmaterial; - -/* exotic.c */ -void load_editMesh(void){} -void make_editMesh(void){} -void free_editMesh(struct EditMesh *em){} -void docenter_new(void){} -int saveover(char *str){ return 0;} - -/* ipo.c */ -void copy_view3d_lock(short val){} // was a hack, to make scene layer ipo's possible - -/* library.c */ -void allspace(unsigned short event, short val){} -#define OOPS_TEST 2 - -/* mball.c */ -ListBase editelems; - -/* object.c */ -void BPY_free_scriptlink(ScriptLink *slink){} -void BPY_copy_scriptlink(ScriptLink *scriptlink){} -float *give_cursor(void){ return 0;} // become a callback or argument - - -/* packedFile.c */ -short pupmenu(char *instr){ return 0;} // will be general callback - -/* sca.c */ -#define LEFTMOUSE 0x001 // because of mouse sensor - -/* scene.c */ -#include "DNA_sequence_types.h" -void free_editing(struct Editing *ed){} // scenes and sequences problem... -void BPY_do_all_scripts (short int event, short int anim){} - -/*editmesh_lib.c*/ -void EM_select_face(struct EditFace *efa, int sel) {} -void EM_select_edge(struct EditEdge *eed, int sel) {} - -/*editmesh.c*/ -struct EditVert *addvertlist(float *vec, struct EditVert *example) { return 0;} -struct EditEdge *addedgelist(struct EditVert *v1, struct EditVert *v2, struct EditEdge *example) { return 0;} -struct EditFace *addfacelist(struct EditVert *v1, struct EditVert *v2, struct EditVert *v3, struct EditVert *v4, struct EditFace *example, struct EditFace *exampleEdges) { return 0;} -struct EditEdge *findedgelist(struct EditVert *v1, struct EditVert *v2) { return 0;} -/*edit.c*/ - -void countall(void) {} - -/* exotic.c */ -int BPY_call_importloader(char *name) -{ - return 0; -} - - -/* texture.c */ -#define FLO 128 -#define INT 96 - - -char texstr[20][12]; /* buttons.c */ - -/* editsca.c */ -void make_unique_prop_names(char *str) {} - -/* DerivedMesh.c */ -void bglBegin(int mode) {} -void bglVertex3fv(float *vec) {} -void bglVertex3f(float x, float y, float z) {} -void bglEnd(void) {} - -/* booleanops.c */ -struct DerivedMesh *NewBooleanDerivedMesh(struct Object *ob, struct Object *ob_select, int int_op_type) { return 0; } - -// bobj read/write debug messages -void elbeemDebugOut(char *msg) {} -void fluidsimSettingsFree(struct FluidsimSettings* sb) {} -void fluidsimSettingsCopy(struct FluidsimSettings* sb) {} - -/*new render funcs */ -int externtex(struct MTex *mtex, float *vec, float *tin, float *tr, float *tg, float *tb, float *ta) { return 0; } -void texture_rgb_blend(float *in, float *tex, float *out, float fact, float facg, int blendtype) {} -float texture_value_blend(float tex, float out, float fact, float facg, int blendtype, int flip) { return 0; } - -void RE_FreeRenderResult(struct RenderResult *rr) {} -void RE_GetResultImage(struct Render *re, struct RenderResult *rr) {} -struct RenderResult *RE_MultilayerConvert(void *exrhandle, int rectx, int recty){return NULL;} -struct Render *RE_GetRender(const char *name) {return (struct Render *)NULL;} -struct RenderResult *RE_GetResult(Render *re) {return (struct RenderResult *)NULL;} -float *RE_RenderLayerGetPass(RenderLayer *rl, int passtype) {return NULL;} -float RE_filter_value(int type, float x) {return 0.0f;} -struct RenderLayer *RE_GetRenderLayer(RenderResult *rr, const char *name) {return (struct RenderLayer *)NULL;} -void RE_Database_Free (struct Render *re) {} -void RE_FreeRender(Render *re) {} -void RE_shade_external(Render *re, ShadeInput *shi, ShadeResult *shr) {} -void RE_DataBase_GetView(Render *re, float mat[][4]) {} -struct Render *RE_NewRender(const char *name) {return (struct Render *)NULL;} -void RE_Database_Baking(struct Render *re, struct Scene *scene, int type, struct Object *actob) {}; - - -/* node_composite.c */ -void RE_zbuf_accumulate_vecblur(struct NodeBlurData *nd, int xsize, int ysize, float *newrect, float *imgrect, float *vecbufrect, float *zbufrect) {} - -int multitex_ext(Tex *tex, float *texvec, float *dxt, float *dyt, int osatex, TexResult *texres) -{ - return 1969; -} - -/* verse */ - -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_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_polygon_set_uint8(struct VerseFace *vface) {} -void post_node_create(struct VNode *vnode) {} -void post_node_destroy(struct VNode *vnode) {} -void post_node_name_set(struct VNode *vnode) {} -void post_tag_change(struct VTag *vtag) {} -void post_taggroup_create(struct VTagGroup *vtaggroup) {} -char *verse_client_name(void) { return NULL; } -void post_transform(struct VNode *vnode) {} -void post_transform_pos(struct VNode *vnode) {} -void post_transform_rot(struct VNode *vnode) {} -void post_transform_scale(struct VNode *vnode) {} -void post_object_free_constraint(struct VNode *vnode) {} -void post_link_set(struct VLink *vlink) {} -void post_link_destroy(struct VLink *vlink) {} -void post_connect_accept(struct VerseSession *session) {} -void post_connect_terminated(struct VerseSession *session) {} -void post_connect_update(struct VerseSession *session) {} -void add_screenhandler(struct bScreen *sc, short eventcode, short val) {} -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) {} -void create_meshdata_from_geom_node(struct Mesh *me, struct VNode *vnode) {} -void post_geometry_free_constraint(struct VNode *vnode) {} -void post_layer_create(struct VLayer *vlayer) {} -void post_layer_destroy(struct VLayer *vlayer) {} -void post_server_add(void) {} - -/* zbuf.c stub */ -void antialias_tagbuf(int xsize, int ysize, char *rectmove) {} - -/* imagetexture.c stub */ -void ibuf_sample(struct ImBuf *ibuf, float fx, float fy, float dx, float dy, float *result) {} - -void update_for_newframe() {} - -struct FileList; -void BIF_filelist_freelib(struct FileList* filelist) {}; - -/* edittime.c stub */ -TimeMarker *get_frame_marker(int frame){return 0;}; - -/* editseq.c */ -Sequence *get_forground_frame_seq(int frame){return 0;}; -void clear_last_seq(Sequence *seq){}; - - -/* modifier.c stub */ -void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd, - float (*vertexcos)[3], int totvert, float cagemat[][4]) {} - -/* particle.c */ -void PE_free_particle_edit(struct ParticleSystem *psys) {} -void PE_get_colors(char sel[4], char nosel[4]) {} -void PE_recalc_world_cos(struct Object *ob, struct ParticleSystem *psys) {} - -/* text.c */ -void txt_copy_clipboard (struct Text *text){} - -char stipple_quarttone[1]; - diff --git a/source/blender/blenkernel/intern/BME_conversions.c b/source/blender/blenkernel/intern/BME_conversions.c index daf0de5b748..2129042bdc2 100644 --- a/source/blender/blenkernel/intern/BME_conversions.c +++ b/source/blender/blenkernel/intern/BME_conversions.c @@ -50,11 +50,11 @@ #include "BLI_blenlib.h" #include "BLI_editVert.h" #include "BLI_edgehash.h" -#include "BIF_editmesh.h" -#include "editmesh.h" +//XXX #include "BIF_editmesh.h" +//XXX #include "editmesh.h" #include "bmesh_private.h" -#include "BSE_edit.h" +//XXX #include "BSE_edit.h" /*merge these functions*/ static void BME_DMcorners_to_loops(BME_Mesh *bm, CustomData *facedata, int index, BME_Poly *f, int numCol, int numTex){ @@ -302,7 +302,7 @@ BME_Mesh *BME_editmesh_to_bmesh(EditMesh *em) { e->flag = eed->f & SELECT; if(eed->sharp) e->flag |= ME_SHARP; if(eed->seam) e->flag |= ME_SEAM; - if(eed->h & EM_FGON) e->flag |= ME_FGON; + //XXX if(eed->h & EM_FGON) e->flag |= ME_FGON; if(eed->h & 1) e->flag |= ME_HIDE; eed->tmp.e = (EditEdge*)e; CustomData_bmesh_copy_data(&em->edata, &bm->edata, eed->data, &e->data); @@ -378,7 +378,7 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) { evlist= (EditVert **)MEM_mallocN(totvert*sizeof(void *),"evlist"); for (i=0,v1=bm->verts.first;v1;v1=v1->next,i++) { v1->tflag1 = i; - eve1 = addvertlist(v1->co,NULL); + eve1 = NULL; //XXX addvertlist(v1->co,NULL); if (td && (vtd = BME_get_transdata(td,v1))) { vtd->loc = eve1->co; } @@ -392,17 +392,17 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) { /* make edges */ for (e=bm->edges.first;e;e=e->next) { - if(!(findedgelist(evlist[e->v1->tflag1], evlist[e->v2->tflag1]))){ - eed= addedgelist(evlist[e->v1->tflag1], evlist[e->v2->tflag1], NULL); + if(0) { //XXX if(!(findedgelist(evlist[e->v1->tflag1], evlist[e->v2->tflag1]))){ + eed= NULL; //XXX addedgelist(evlist[e->v1->tflag1], evlist[e->v2->tflag1], NULL); eed->crease = e->crease; eed->bweight = e->bweight; if(e->flag & ME_SEAM) eed->seam = 1; if(e->flag & ME_SHARP) eed->sharp = 1; if(e->flag & SELECT) eed->f |= SELECT; - if(e->flag & ME_FGON) eed->h= EM_FGON; // 2 different defines! + //XXX if(e->flag & ME_FGON) eed->h= EM_FGON; // 2 different defines! if(e->flag & ME_HIDE) eed->h |= 1; if(G.scene->selectmode==SCE_SELECT_EDGE) - EM_select_edge(eed, eed->f & SELECT); + ; //XXX EM_select_edge(eed, eed->f & SELECT); CustomData_em_copy_data(&bm->edata, &em->edata, e->data, &eed->data); } @@ -422,7 +422,7 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) { eve4= NULL; } - efa = addfacelist(eve1, eve2, eve3, eve4, NULL, NULL); + efa = NULL; //XXX addfacelist(eve1, eve2, eve3, eve4, NULL, NULL); efa->mat_nr = (unsigned char)f->mat_nr; efa->flag= f->flag & ~ME_HIDE; if(f->flag & ME_FACE_SEL) { @@ -430,7 +430,7 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) { } if(f->flag & ME_HIDE) efa->h= 1; if((G.f & G_FACESELECT) && (efa->f & SELECT)) - EM_select_face(efa, 1); /* flush down */ + ; //XXX EM_select_face(efa, 1); /* flush down */ CustomData_em_copy_data(&bm->pdata, &em->fdata, f->data, &efa->data); BME_loops_to_corners(bm, &em->fdata, efa->data, f,numCol,numTex); } @@ -438,7 +438,7 @@ EditMesh *BME_bmesh_to_editmesh(BME_Mesh *bm, BME_TransData_Head *td) { MEM_freeN(evlist); - countall(); + //XXX countall(); return em; } diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c index 90259031e5c..8aaa7aca023 100644 --- a/source/blender/blenkernel/intern/BME_tools.c +++ b/source/blender/blenkernel/intern/BME_tools.c @@ -38,14 +38,13 @@ #include "DNA_listBase.h" #include "DNA_meshdata_types.h" #include "DNA_mesh_types.h" +#include "DNA_object_types.h" #include "BKE_utildefines.h" #include "BKE_bmesh.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" -#include "blendef.h" - /*split this all into a seperate bevel.c file in src*/ /* ------- Bevel code starts here -------- */ diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index b7f068c936b..aab39a099bf 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -87,6 +87,8 @@ #include "BIF_gl.h" #include "BIF_glutil.h" +//XXX #include "multires.h" +// #include "GPU_draw.h" #include "GPU_extensions.h" #include "GPU_material.h" @@ -627,7 +629,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us if(draw) { if (draw==2) { /* enabled with stipple */ glEnable(GL_POLYGON_STIPPLE); - glPolygonStipple(stipple_quarttone); + glPolygonStipple(0); //XXX stipple_quarttone); } glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); @@ -664,7 +666,7 @@ static void emDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *us if(draw) { if (draw==2) { /* enabled with stipple */ glEnable(GL_POLYGON_STIPPLE); - glPolygonStipple(stipple_quarttone); + glPolygonStipple(0); //XXX stipple_quarttone); } glShadeModel(drawSmooth?GL_SMOOTH:GL_FLAT); @@ -1706,12 +1708,12 @@ static void vDM_drawVerts(DerivedMesh *dm) vvert = vdm->vertex_layer->dl.lb.first; - bglBegin(GL_POINTS); + //XXX bglBegin(GL_POINTS); while(vvert) { - bglVertex3fv(vdm->vertexCos ? vvert->cos : vvert->co); + //XXX bglVertex3fv(vdm->vertexCos ? vvert->cos : vvert->co); vvert = vvert->next; } - bglEnd(); + //XXX bglEnd(); } /* draw all edges of VerseFaces ... it isn't optimal, because verse @@ -2816,18 +2818,18 @@ float *multires_render_pin(Object *ob, Mesh *me, int *orig_lvl) int i; /* Make sure all mesh edits are properly stored in the multires data*/ - multires_update_levels(me, 1); + //XXX multires_update_levels(me, 1); /* Copy the highest level of multires verts */ *orig_lvl= me->mr->current; - lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); + //XXX lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); vert_copy= MEM_callocN(sizeof(float)*3*lvl->totvert, "multires vert_copy"); for(i=0; i<lvl->totvert; ++i) VecCopyf(&vert_copy[i*3], me->mr->verts[i].co); /* Goto the pin level for multires */ me->mr->newlvl= me->mr->pinlvl; - multires_set_level(ob, me, 1); + //XXX multires_set_level(ob, me, 1); } return vert_copy; @@ -2840,7 +2842,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c if(me->mr && !(me->mr->flag & MULTIRES_NO_RENDER)) { if((*dm)->getNumVerts(*dm) == me->totvert && (*dm)->getNumFaces(*dm) == me->totface) { - MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); + //XXX MultiresLevel *lvl= multires_level_n(me->mr, BLI_countlist(&me->mr->levels)); DerivedMesh *old= NULL; MVert *vertdup= NULL; int i; @@ -2854,7 +2856,7 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c MEM_freeN(vertdup); /* Go to the render level */ me->mr->newlvl= me->mr->renderlvl; - multires_set_level(ob, me, 1); + //XXX multires_set_level(ob, me, 1); (*dm)= getMeshDerivedMesh(me, ob, NULL); /* Some of the data in dm is referenced externally, so make a copy */ @@ -2867,16 +2869,16 @@ void multires_render_final(Object *ob, Mesh *me, DerivedMesh **dm, float *vert_c /* Restore the original verts */ me->mr->newlvl= BLI_countlist(&me->mr->levels); - multires_set_level(ob, me, 1); - for(i=0; i<lvl->totvert; ++i) - VecCopyf(me->mvert[i].co, &vert_copy[i*3]); + //XXX multires_set_level(ob, me, 1); + //XXX for(i=0; i<lvl->totvert; ++i) + //XXX VecCopyf(me->mvert[i].co, &vert_copy[i*3]); } if(vert_copy) MEM_freeN(vert_copy); me->mr->newlvl= orig_lvl; - multires_set_level(ob, me, 1); + //XXX multires_set_level(ob, me, 1); } } diff --git a/source/blender/blenkernel/intern/Makefile b/source/blender/blenkernel/intern/Makefile index 8921ea5d3b7..4cfc8f91efe 100644 --- a/source/blender/blenkernel/intern/Makefile +++ b/source/blender/blenkernel/intern/Makefile @@ -53,7 +53,7 @@ CPPFLAGS += -I../../avi CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include # we still refer to /include a bit... -CPPFLAGS += -I../../include +CPPFLAGS += -I../../editors/include # to include the render stuff: CPPFLAGS += -I../../render/extern/include diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c index e0afdec5e23..1c720cea21f 100644 --- a/source/blender/blenkernel/intern/action.c +++ b/source/blender/blenkernel/intern/action.c @@ -64,7 +64,7 @@ #include "BLI_blenlib.h" #include "BLI_ghash.h" -#include "nla.h" +//XXX #include "nla.h" /* *********************** NOTE ON POSE AND ACTION ********************** @@ -195,9 +195,9 @@ bAction *copy_action (bAction *src) dst= copy_libblock(src); - duplicatelist(&(dst->chanbase), &(src->chanbase)); - duplicatelist(&(dst->groups), &(src->groups)); - duplicatelist(&(dst->markers), &(src->markers)); + BLI_duplicatelist(&(dst->chanbase), &(src->chanbase)); + BLI_duplicatelist(&(dst->groups), &(src->groups)); + BLI_duplicatelist(&(dst->markers), &(src->markers)); for (dchan=dst->chanbase.first, schan=src->chanbase.first; dchan; dchan=dchan->next, schan=schan->next) { for (dgrp=dst->groups.first, sgrp=src->groups.first; dgrp && sgrp; dgrp=dgrp->next, sgrp=sgrp->next) { @@ -299,7 +299,7 @@ void copy_pose(bPose **dst, bPose *src, int copycon) outPose= MEM_callocN(sizeof(bPose), "pose"); - duplicatelist(&outPose->chanbase, &src->chanbase); + BLI_duplicatelist (&outPose->chanbase, &src->chanbase); if (copycon) { for (pchan=outPose->chanbase.first; pchan; pchan=pchan->next) { @@ -363,7 +363,7 @@ void game_copy_pose(bPose **dst, bPose *src) out= MEM_dupallocN(src); out->agroups.first= out->agroups.last= NULL; - duplicatelist(&out->chanbase, &src->chanbase); + BLI_duplicatelist(&out->chanbase, &src->chanbase); /* remap pointers */ ghash= BLI_ghash_new(BLI_ghashutil_ptrhash, BLI_ghashutil_ptrcmp); diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c index 731c2a18c55..aeddabf8c1b 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 <config.h> #endif @@ -100,8 +98,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 155d5a7d21c..8bb694f45e8 100644 --- a/source/blender/blenkernel/intern/armature.c +++ b/source/blender/blenkernel/intern/armature.c @@ -34,7 +34,7 @@ #include "MEM_guardedalloc.h" -#include "nla.h" +//XXX #include "nla.h" #include "BLI_arithb.h" #include "BLI_blenlib.h" @@ -67,7 +67,7 @@ #include "BKE_object.h" #include "BKE_utildefines.h" -#include "BIF_editdeform.h" +//XXX #include "BIF_editdeform.h" #include "IK_solver.h" @@ -180,7 +180,7 @@ static void copy_bonechildren (Bone* newBone, Bone* oldBone) Bone *curBone, *newChildBone; /* Copy this bone's list*/ - duplicatelist (&newBone->childbase, &oldBone->childbase); + BLI_duplicatelist (&newBone->childbase, &oldBone->childbase); /* For each child in the list, update it's children*/ newChildBone=newBone->childbase.first; @@ -197,7 +197,7 @@ bArmature *copy_armature(bArmature *arm) Bone *oldBone, *newBone; newArm= copy_libblock (arm); - duplicatelist(&newArm->bonebase, &arm->bonebase); + BLI_duplicatelist(&newArm->bonebase, &arm->bonebase); /* Duplicate the childrens' lists*/ newBone=newArm->bonebase.first; @@ -1433,7 +1433,7 @@ static void pose_proxy_synchronize(Object *ob, Object *from, int layer_protected * so syncing things correctly needs careful attention */ BLI_freelistN(&pose->agroups); - duplicatelist(&pose->agroups, &frompose->agroups); + BLI_duplicatelist(&pose->agroups, &frompose->agroups); pose->active_group= frompose->active_group; for (pchan= pose->chanbase.first; pchan; pchan= pchan->next) { diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c index 5dcccc56d06..b63d63c925c 100644 --- a/source/blender/blenkernel/intern/blender.c +++ b/source/blender/blenkernel/intern/blender.c @@ -48,12 +48,16 @@ #include "MEM_guardedalloc.h" +#include "DNA_curve_types.h" #include "DNA_listBase.h" #include "DNA_sdna_types.h" #include "DNA_userdef_types.h" #include "DNA_object_types.h" -#include "DNA_curve_types.h" +#include "DNA_mesh_types.h" #include "DNA_scene_types.h" +#include "DNA_screen_types.h" +#include "DNA_sound_types.h" +#include "DNA_sequence_types.h" #include "BLI_blenlib.h" #include "BLI_dynstr.h" @@ -61,9 +65,6 @@ #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "DNA_mesh_types.h" -#include "DNA_screen_types.h" - #include "BKE_action.h" #include "BKE_blender.h" #include "BKE_curve.h" @@ -84,15 +85,12 @@ #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" -#include "nla.h" -#include "blendef.h" + Global G; UserDef U; +ListBase WMlist= {NULL, NULL}; char versionstr[48]= ""; @@ -181,22 +179,6 @@ void free_blender(void) free_nodesystem(); } -void duplicatelist(ListBase *list1, ListBase *list2) /* copy from 2 to 1 */ -{ - struct Link *link1, *link2; - - list1->first= list1->last= 0; - - link2= list2->first; - while(link2) { - - link1= MEM_dupallocN(link2); - BLI_addtail(list1, link1); - - link2= link2->next; - } -} - static EditMesh theEditMesh; void initglobals(void) @@ -237,21 +219,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; @@ -266,8 +246,6 @@ static void clear_global(void) G.sima= NULL; G.sipo= NULL; - free_vertexpaint(); - G.f &= ~(G_WEIGHTPAINT + G_VERTEXPAINT + G_FACESELECT + G_PARTICLEEDIT); } @@ -314,7 +292,10 @@ static void clean_paths(Main *main) } } -static void setup_app_data(BlendFileData *bfd, char *filename) +/* context matching */ +/* handle no-ui case */ + +static void setup_app_data(bContext *C, BlendFileData *bfd, char *filename) { Object *ob; bScreen *curscreen= NULL; @@ -328,6 +309,8 @@ static void setup_app_data(BlendFileData *bfd, char *filename) clean_paths(bfd->main); + /* XXX here the complex windowmanager matching */ + /* no load screens? */ if(mode) { /* comes from readfile.c */ @@ -337,7 +320,7 @@ static void setup_app_data(BlendFileData *bfd, char *filename) SWAP(ListBase, G.main->script, bfd->main->script); /* we re-use current screen */ - curscreen= G.curscreen; + curscreen= C->screen; /* but use new Scene pointer */ curscene= bfd->curscene; if(curscene==NULL) curscene= bfd->main->scene.first; @@ -348,11 +331,13 @@ static void setup_app_data(BlendFileData *bfd, char *filename) lib_link_screen_restore(bfd->main, curscene); } - clear_global(); /* free Main database */ + /* free G.main Main database */ + clear_global(); if(mode!='u') G.save_over = 1; G.main= bfd->main; + if (bfd->user) { /* only here free userdef themes... */ @@ -360,7 +345,6 @@ static void setup_app_data(BlendFileData *bfd, char *filename) U= *bfd->user; MEM_freeN(bfd->user); - } /* samples is a global list... */ @@ -368,20 +352,20 @@ static void setup_app_data(BlendFileData *bfd, char *filename) /* case G_FILE_NO_UI or no screens in file */ if(mode) { - G.curscreen= curscreen; - G.scene= curscene; + C->screen= curscreen; + C->scene= curscene; } else { G.winpos= bfd->winpos; G.displaymode= bfd->displaymode; G.fileflags= bfd->fileflags; - G.curscreen= bfd->curscreen; - G.scene= G.curscreen->scene; + C->screen= bfd->curscreen; + C->scene= C->screen->scene; } /* this can happen when active scene was lib-linked, and doesnt exist anymore */ - if(G.scene==NULL) { - G.scene= G.main->scene.first; - G.curscreen->scene= G.scene; + if(C->scene==NULL) { + C->scene= G.main->scene.first; + C->screen->scene= C->scene; } /* special cases, override loaded flags: */ @@ -393,11 +377,11 @@ static void setup_app_data(BlendFileData *bfd, char *filename) G.f= bfd->globalf; if (!G.background) { - setscreen(G.curscreen); + //setscreen(G.curscreen); } /* baseflags, groups, make depsgraph, etc */ - set_scene_bg(G.scene); + set_scene_bg(C->scene); /* clear BONE_UNKEYED flags, these are not valid anymore for proxies */ framechange_poses_clear_unkeyed(); @@ -409,11 +393,11 @@ static void setup_app_data(BlendFileData *bfd, char *filename) } /* now tag update flags, to ensure deformers get calculated on redraw */ - DAG_scene_update_flags(G.scene, G.scene->lay); + DAG_scene_update_flags(C->scene, C->scene->lay); if (G.f & G_DOSCRIPTLINKS) { /* there's an onload scriptlink to execute in screenmain */ - mainqenter(ONLOAD_SCRIPT, 1); +// XXX mainqenter(ONLOAD_SCRIPT, 1); } if (G.sce != filename) /* these are the same at times, should never copy to the same location */ strcpy(G.sce, filename); @@ -432,7 +416,7 @@ static void handle_subversion_warning(Main *main) char str[128]; sprintf(str, "File written by newer Blender binary: %d.%d , expect loss of data!", main->minversionfile, main->minsubversionfile); - error(str); +// XXX error(str); } } @@ -443,78 +427,55 @@ static void handle_subversion_warning(Main *main) 2: OK, and with new user settings */ -int BKE_read_file(char *dir, void *type_r) +int BKE_read_file(bContext *C, char *dir, void *unused) { BlendReadError bre; BlendFileData *bfd; int retval= 1; - if (!G.background) - waitcursor(1); - bfd= BLO_read_from_file(dir, &bre); if (bfd) { if(bfd->user) retval= 2; - if (type_r) - *((BlenFileType*)type_r)= bfd->type; - setup_app_data(bfd, dir); + setup_app_data(C, bfd, dir); handle_subversion_warning(G.main); } else { - error("Loading %s failed: %s", dir, BLO_bre_as_string(bre)); +// XXX error("Loading %s failed: %s", dir, BLO_bre_as_string(bre)); } - - if (!G.background) - waitcursor(0); - + return (bfd?retval:0); } -int BKE_read_file_from_memory(char* filebuf, int filelength, void *type_r) +int BKE_read_file_from_memory(bContext *C, char* filebuf, int filelength, void *unused) { BlendReadError bre; BlendFileData *bfd; - - if (!G.background) - waitcursor(1); - + bfd= BLO_read_from_memory(filebuf, filelength, &bre); if (bfd) { - if (type_r) - *((BlenFileType*)type_r)= bfd->type; - - setup_app_data(bfd, "<memory2>"); + setup_app_data(C, bfd, "<memory2>"); } else { - error("Loading failed: %s", BLO_bre_as_string(bre)); +// XXX error("Loading failed: %s", BLO_bre_as_string(bre)); } - - if (!G.background) - waitcursor(0); - + return (bfd?1:0); } /* memfile is the undo buffer */ -int BKE_read_file_from_memfile(MemFile *memfile) +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(bfd, "<memory1>"); + setup_app_data(C, bfd, "<memory1>"); } else { - error("Loading failed: %s", BLO_bre_as_string(bre)); +// XXX error("Loading failed: %s", BLO_bre_as_string(bre)); } - - if (!G.background) - waitcursor(0); - + return (bfd?1:0); } @@ -536,7 +497,7 @@ static ListBase undobase={NULL, NULL}; static UndoElem *curundo= NULL; -static int read_undosave(UndoElem *uel) +static int read_undosave(bContext *C, UndoElem *uel) { char scestr[FILE_MAXDIR+FILE_MAXFILE]; int success=0, fileflags; @@ -546,9 +507,9 @@ static int read_undosave(UndoElem *uel) G.fileflags |= G_FILE_NO_UI; if(UNDO_DISK) - success= BKE_read_file(uel->str, NULL); + success= BKE_read_file(C, uel->str, NULL); else - success= BKE_read_file_from_memfile(&uel->memfile); + success= BKE_read_file_from_memfile(C, &uel->memfile); /* restore */ strcpy(G.sce, scestr); @@ -558,7 +519,7 @@ static int read_undosave(UndoElem *uel) } /* name can be a dynamic string */ -void BKE_write_undo(char *name) +void BKE_write_undo(bContext *C, char *name) { uintptr_t maxmem, totmem, memused; int nr, success; @@ -612,7 +573,7 @@ void BKE_write_undo(char *name) sprintf(numstr, "%d.blend", counter); BLI_make_file_string("/", tstr, btempdir, numstr); - success= BLO_write_file(tstr, G.fileflags, &err); + success= BLO_write_file(C, tstr, G.fileflags, &err); strcpy(curundo->str, tstr); } @@ -623,7 +584,7 @@ void BKE_write_undo(char *name) if(curundo->prev) prevfile= &(curundo->prev->memfile); memused= MEM_get_memory_in_use(); - success= BLO_write_file_mem(prevfile, &curundo->memfile, G.fileflags, &err); + success= BLO_write_file_mem(C, prevfile, &curundo->memfile, G.fileflags, &err); curundo->undosize= MEM_get_memory_in_use() - memused; } @@ -657,28 +618,28 @@ void BKE_write_undo(char *name) /* 1= an undo, -1 is a redo. we have to make sure 'curundo' remains at current situation * Note, ALWAYS call sound_initialize_sounds after BKE_undo_step() */ -void BKE_undo_step(int step) +void BKE_undo_step(bContext *C, int step) { if(step==0) { - read_undosave(curundo); + read_undosave(C, curundo); } else if(step==1) { /* curundo should never be NULL, after restart or load file it should call undo_save */ - if(curundo==NULL || curundo->prev==NULL) error("No undo available"); + if(curundo==NULL || curundo->prev==NULL) ; // XXX error("No undo available"); else { if(G.f & G_DEBUG) printf("undo %s\n", curundo->name); curundo= curundo->prev; - read_undosave(curundo); + read_undosave(C, curundo); } } else { /* curundo has to remain current situation! */ - if(curundo==NULL || curundo->next==NULL) error("No redo available"); + if(curundo==NULL || curundo->next==NULL) ; // XXX error("No redo available"); else { - read_undosave(curundo->next); + read_undosave(C, curundo->next); curundo= curundo->next; if(G.f & G_DEBUG) printf("redo %s\n", curundo->name); } @@ -700,7 +661,7 @@ void BKE_reset_undo(void) } /* based on index nr it does a restore */ -void BKE_undo_number(int nr) +void BKE_undo_number(bContext *C, int nr) { UndoElem *uel; int a=1; @@ -709,7 +670,7 @@ void BKE_undo_number(int nr) if(a==nr) break; } curundo= uel; - BKE_undo_step(0); + BKE_undo_step(C, 0); } char *BKE_undo_menu_string(void) @@ -754,7 +715,7 @@ void BKE_undo_save_quit(void) file = open(str,O_BINARY+O_WRONLY+O_CREAT+O_TRUNC, 0666); if(file == -1) { - error("Unable to save %s, check you have permissions", str); + //XXX error("Unable to save %s, check you have permissions", str); return; } @@ -766,7 +727,7 @@ void BKE_undo_save_quit(void) close(file); - if(chunk) error("Unable to save %s, internal error", str); + if(chunk) ; //XXX error("Unable to save %s, internal error", str); else printf("Saved session recovery to %s\n", str); } diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 775f1dee241..9db3dda94eb 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -45,7 +45,6 @@ #include "BKE_modifier.h" #include "BKE_utildefines.h" #include "BKE_DerivedMesh.h" -#include "mydevice.h" #include "Bullet-C-Api.h" diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c index 5639f00ee39..b8bfb002075 100644 --- a/source/blender/blenkernel/intern/constraint.c +++ b/source/blender/blenkernel/intern/constraint.c @@ -31,9 +31,10 @@ #include <stddef.h> #include <string.h> #include <math.h> +#include <float.h> #include "MEM_guardedalloc.h" -#include "nla.h" +//XXX #include "nla.h" #include "BLI_blenlib.h" #include "BLI_arithb.h" @@ -68,8 +69,6 @@ #include "BPY_extern.h" #endif -#include "blendef.h" - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -112,7 +111,7 @@ void copy_constraint_channels (ListBase *dst, ListBase *src) bConstraintChannel *dchan, *schan; dst->first = dst->last = NULL; - duplicatelist(dst, src); + BLI_duplicatelist(dst, src); for (dchan=dst->first, schan=src->first; dchan; dchan=dchan->next, schan=schan->next) { dchan->ipo = copy_ipo(schan->ipo); @@ -127,7 +126,7 @@ void clone_constraint_channels (ListBase *dst, ListBase *src) bConstraintChannel *dchan, *schan; dst->first = dst->last = NULL; - duplicatelist(dst, src); + BLI_duplicatelist(dst, src); for (dchan=dst->first, schan=src->first; dchan; dchan=dchan->next, schan=schan->next) { id_us_plus((ID *)dchan->ipo); @@ -1843,7 +1842,7 @@ static void pycon_copy (bConstraint *con, bConstraint *srccon) bPythonConstraint *opycon = (bPythonConstraint *)srccon->data; pycon->prop = IDP_CopyProperty(opycon->prop); - duplicatelist(&pycon->targets, &opycon->targets); + BLI_duplicatelist(&pycon->targets, &opycon->targets); } static void pycon_new_data (void *cdata) @@ -3372,7 +3371,7 @@ void copy_constraints (ListBase *dst, ListBase *src) bConstraint *con, *srccon; dst->first= dst->last= NULL; - duplicatelist(dst, src); + BLI_duplicatelist(dst, src); for (con=dst->first, srccon=src->first; con; srccon=srccon->next, con=con->next) { bConstraintTypeInfo *cti= constraint_get_typeinfo(con); diff --git a/source/blender/blenkernel/intern/depsgraph.c b/source/blender/blenkernel/intern/depsgraph.c index 59619b25f8b..f5deda9c3c9 100644 --- a/source/blender/blenkernel/intern/depsgraph.c +++ b/source/blender/blenkernel/intern/depsgraph.c @@ -77,7 +77,6 @@ #include "BKE_scene.h" #include "MEM_guardedalloc.h" -#include "blendef.h" #ifndef DISABLE_PYTHON #include "BPY_extern.h" diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 35097c05358..44aa439ee3e 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -60,7 +60,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" @@ -558,6 +557,7 @@ static void mesh_create_shadedColors(Render *re, Object *ob, int onlyForMesh, un } for (i=0; i<totface; i++) { + extern Material defmaterial; /* material.c */ MFace *mf= &mface[i]; Material *ma= give_current_material(ob, mf->mat_nr+1); int j, vidx[4], nverts= mf->v4?4:3; @@ -669,6 +669,8 @@ void shadeDispList(Base *base) dl= cu->disp.first; while(dl) { + extern Material defmaterial; /* material.c */ + dlob= MEM_callocN(sizeof(DispList), "displistshade"); BLI_addtail(&ob->disp, dlob); dlob->type= DL_VERTCOL; @@ -739,6 +741,7 @@ void shadeDispList(Base *base) if(dl->type==DL_INDEX4) { if(dl->nors) { + extern Material defmaterial; /* material.c */ if(dl->col1) MEM_freeN(dl->col1); col1= dl->col1= MEM_mallocN(sizeof(int)*dl->nr, "col1"); @@ -1370,7 +1373,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; @@ -1453,7 +1456,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 122c6c71a6c..66e8a039dda 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -57,7 +57,6 @@ #include "BKE_action.h" #include "BKE_anim.h" /* needed for where_on_path */ #include "BKE_armature.h" -#include "BKE_bad_level_calls.h" #include "BKE_blender.h" #include "BKE_collision.h" #include "BKE_constraint.h" @@ -92,7 +91,10 @@ #include <string.h> #endif // DISABLE_ELBEEM +//XXX #include "BIF_screen.h" + /* temporal struct, used for reading return of mesh_get_mapped_verts_nors() */ + typedef struct VeNoCo { float co[3], no[3]; } VeNoCo; diff --git a/source/blender/blenkernel/intern/exotic.c b/source/blender/blenkernel/intern/exotic.c index ee3fd59fe9f..28ed74aa9db 100644 --- a/source/blender/blenkernel/intern/exotic.c +++ b/source/blender/blenkernel/intern/exotic.c @@ -100,7 +100,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" @@ -125,8 +124,6 @@ #include "BPY_extern.h" #endif -#include "blendef.h" - #include "zlib.h" static int is_dxf(char *str); @@ -181,7 +178,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 { \ @@ -248,7 +244,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; } @@ -309,7 +305,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); @@ -321,7 +317,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; \ } @@ -330,7 +325,6 @@ static void read_stl_mesh_binary(char *str) fclose(fpSTL); \ free(vertdata); \ sprintf(error_msg, "Line %d: %s", linenum, message); \ - error(message); \ return; \ } @@ -366,7 +360,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; } @@ -376,7 +370,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 */ @@ -399,7 +393,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 @@ -477,7 +471,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 @@ -501,7 +495,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; } @@ -510,12 +504,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; } @@ -689,7 +683,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) @@ -707,7 +701,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; } @@ -716,12 +710,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; } @@ -757,7 +751,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); @@ -872,7 +866,7 @@ static void read_radiogour(char *str) mesh_add_normals_flags(me); make_edges(me, 0); - waitcursor(1); + //XXX waitcursor(1); } @@ -887,7 +881,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; } @@ -932,7 +926,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; } @@ -1246,7 +1240,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; } @@ -2021,7 +2015,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; } @@ -2260,7 +2254,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; @@ -2296,7 +2290,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; @@ -2382,7 +2376,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); @@ -2390,11 +2384,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; @@ -2402,7 +2396,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; @@ -2414,7 +2408,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)) { @@ -2439,12 +2433,12 @@ 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"); } } #endif /* DISABLE_PYTHON */ - waitcursor(0); + //XXX waitcursor(0); } } } @@ -2528,19 +2522,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. @@ -2577,7 +2571,7 @@ void write_stl(char *str) fclose(fpSTL); - waitcursor(0); + //XXX waitcursor(0); } static void write_videoscape_mesh(Object *ob, char *str) @@ -2702,7 +2696,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); @@ -3017,18 +3012,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 */ @@ -3096,7 +3090,7 @@ void write_vrml(char *str) fclose(fp); - waitcursor(0); + //XXX waitcursor(0); } @@ -3331,19 +3325,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 */ @@ -3396,7 +3390,7 @@ void write_dxf(char *str) write_group(0, "EOF"); fclose(fp); - waitcursor(0); + //XXX waitcursor(0); } @@ -3523,13 +3517,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]; @@ -4342,7 +4337,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); @@ -4374,7 +4369,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); @@ -4454,14 +4449,14 @@ static void dxf_read_lwpolyline(int noob) { if (id == 10) { vert[0]= (float) atof(val); } else { - error("Error parsing dxf, expected (10, <x>) at line %d", dxf_line); + //XXX error("Error parsing dxf, expected (10, <x>) at line %d", dxf_line); } read_group(id,val); if (id == 20) { vert[1]= (float) atof(val); } else { - error("Error parsing dxf, expected (20, <y>) at line %d", dxf_line); + //XXX error("Error parsing dxf, expected (20, <y>) at line %d", dxf_line); } mvert = &me->mvert[v]; @@ -4597,7 +4592,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); @@ -4710,7 +4705,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; } @@ -4820,7 +4815,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 52275e507dd..a8a97742c24 100644 --- a/source/blender/blenkernel/intern/font.c +++ b/source/blender/blenkernel/intern/font.c @@ -53,7 +53,6 @@ #include "DNA_scene_types.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" #include "BKE_packedFile.h" @@ -70,6 +69,8 @@ struct SelBox *selboxes= NULL; +static ListBase ttfdata= {NULL, NULL}; + /* UTF-8 <-> wchar transformations */ void chtoutf8(unsigned long c, char *o) @@ -270,22 +271,46 @@ static PackedFile *get_builtin_packedfile(void) } } -static VFontData *vfont_get_data(VFont *vfont) +void free_ttfont(void) +{ + struct TmpFont *tf; + + tf= ttfdata.first; + while(tf) { + freePackedFile(tf->pf); + tf->pf= NULL; + tf->vfont= NULL; + tf= tf->next; + } + BLI_freelistN(&ttfdata); +} + +struct TmpFont *vfont_find_tmpfont(VFont *vfont) { struct TmpFont *tmpfnt = NULL; - PackedFile *tpf; if(vfont==NULL) return NULL; // Try finding the font from font list - tmpfnt = G.ttfdata.first; - + tmpfnt = ttfdata.first; while(tmpfnt) { if(tmpfnt->vfont == vfont) break; tmpfnt = tmpfnt->next; } + return tmpfnt; +} + +static VFontData *vfont_get_data(VFont *vfont) +{ + struct TmpFont *tmpfnt = NULL; + PackedFile *tpf; + + if(vfont==NULL) return NULL; + + // Try finding the font from font list + tmpfnt = vfont_find_tmpfont(vfont); // And then set the data if (!vfont->data) { @@ -309,7 +334,7 @@ static VFontData *vfont_get_data(VFont *vfont) tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; - BLI_addtail(&G.ttfdata, tmpfnt); + BLI_addtail(&ttfdata, tmpfnt); } } else { pf= newPackedFile(vfont->name); @@ -322,7 +347,7 @@ static VFontData *vfont_get_data(VFont *vfont) tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; - BLI_addtail(&G.ttfdata, tmpfnt); + BLI_addtail(&ttfdata, tmpfnt); } } if(!pf) { @@ -376,8 +401,6 @@ VFont *load_vfont(char *name) if (pf) { VFontData *vfd; - - waitcursor(1); #ifdef WITH_FREETYPE2 vfd= BLI_vfontdata_from_freetypefont(pf); @@ -402,7 +425,7 @@ VFont *load_vfont(char *name) tmpfnt= (struct TmpFont *) MEM_callocN(sizeof(struct TmpFont), "temp_font"); tmpfnt->pf= tpf; tmpfnt->vfont= vfont; - BLI_addtail(&G.ttfdata, tmpfnt); + BLI_addtail(&ttfdata, tmpfnt); } } @@ -411,7 +434,7 @@ VFont *load_vfont(char *name) freePackedFile(pf); } - waitcursor(0); + //XXX waitcursor(0); } return vfont; diff --git a/source/blender/blenkernel/intern/idprop.c b/source/blender/blenkernel/intern/idprop.c index 79ecbf09f55..542a1dff651 100644 --- a/source/blender/blenkernel/intern/idprop.c +++ b/source/blender/blenkernel/intern/idprop.c @@ -25,6 +25,10 @@ * ***** END GPL LICENSE BLOCK ***** */ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> + #include "DNA_listBase.h" #include "DNA_ID.h" @@ -37,10 +41,6 @@ #include "MEM_guardedalloc.h" -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - #define BSTR_EQ(a, b) (*(a) == *(b) && !strcmp(a, b)) /* IDPropertyTemplate is a union in DNA_ID.h */ diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index d5166fc7a83..de1747e514c 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -55,6 +55,7 @@ #include "DNA_camera_types.h" #include "DNA_sequence_types.h" #include "DNA_texture_types.h" +#include "DNA_sequence_types.h" #include "DNA_userdef_types.h" #include "BLI_arithb.h" @@ -72,7 +73,7 @@ #include "BKE_texture.h" #include "BKE_utildefines.h" -#include "BIF_editseq.h" +//XXX #include "BIF_editseq.h" #include "PIL_time.h" @@ -81,9 +82,6 @@ /* for stamp drawing to an image */ #include "BMF_Api.h" -#include "blendef.h" -#include "BSE_time.h" - #include "GPU_extensions.h" #include "GPU_draw.h" @@ -945,7 +943,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_MARKER) { - TimeMarker *marker = get_frame_marker(CFRA); + TimeMarker *marker = NULL; // XXX get_frame_marker(G.scene->r.cfra); if (marker) strcpy(text, marker->name); else strcpy(text, "<none>"); @@ -1010,7 +1008,7 @@ static void stampdata(StampData *stamp_data, int do_prefix) } if (G.scene->r.stamp & R_STAMP_SEQSTRIP) { - Sequence *seq = get_forground_frame_seq(CFRA); + Sequence *seq; //XXX = get_forground_frame_seq(G.scene->r.cfra); if (seq) strcpy(text, seq->name+2); else strcpy(text, "<none>"); diff --git a/source/blender/blenkernel/intern/ipo.c b/source/blender/blenkernel/intern/ipo.c index 29db0ddd808..8407c66d584 100644 --- a/source/blender/blenkernel/intern/ipo.c +++ b/source/blender/blenkernel/intern/ipo.c @@ -60,7 +60,6 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BKE_bad_level_calls.h" #include "BKE_utildefines.h" #include "BKE_action.h" @@ -305,7 +304,7 @@ Ipo *copy_ipo (Ipo *src) return NULL; dst= copy_libblock(src); - duplicatelist(&dst->curve, &src->curve); + BLI_duplicatelist(&dst->curve, &src->curve); for (icu= src->curve.first; icu; icu= icu->next) { icu->bezt= MEM_dupallocN(icu->bezt); @@ -1539,7 +1538,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 755a41ec4b2..a34da4377b1 100644 --- a/source/blender/blenkernel/intern/key.c +++ b/source/blender/blenkernel/intern/key.c @@ -45,7 +45,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" @@ -60,8 +59,6 @@ #include "BLI_blenlib.h" -#include "blendef.h" - #ifdef HAVE_CONFIG_H #include <config.h> #endif @@ -154,7 +151,7 @@ Key *copy_key(Key *key) keyn->ipo= copy_ipo(key->ipo); - duplicatelist(&keyn->block, &key->block); + BLI_duplicatelist(&keyn->block, &key->block); kb= key->block.first; kbn= keyn->block.first; diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c index 6614c657647..3f9143bb405 100644 --- a/source/blender/blenkernel/intern/lattice.c +++ b/source/blender/blenkernel/intern/lattice.c @@ -70,14 +70,12 @@ #include "BKE_screen.h" #include "BKE_utildefines.h" -#include "BIF_editdeform.h" +//XXX #include "BIF_editdeform.h" #ifdef HAVE_CONFIG_H #include <config.h> #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 3d1b342bf73..3acc10e8022 100644 --- a/source/blender/blenkernel/intern/library.c +++ b/source/blender/blenkernel/intern/library.c @@ -76,12 +76,12 @@ #include "DNA_effect_types.h" #include "DNA_brush_types.h" #include "DNA_particle_types.h" -#include "BKE_particle.h" +#include "DNA_space_types.h" +#include "DNA_windowmanager_types.h" #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" @@ -110,8 +110,7 @@ #include "BKE_effect.h" #include "BKE_brush.h" #include "BKE_idprop.h" - -#include "DNA_space_types.h" +#include "BKE_particle.h" #define MAX_IDPUP 60 /* was 24 */ @@ -195,6 +194,8 @@ ListBase *wich_libbase(Main *mainlib, short type) return &(mainlib->brush); case ID_PA: return &(mainlib->particle); + case ID_WM: + return &(mainlib->wm); } return 0; } @@ -264,6 +265,7 @@ int set_listbasepointers(Main *main, ListBase **lb) lb[a++]= &(main->object); lb[a++]= &(main->scene); lb[a++]= &(main->library); + lb[a++]= &(main->wm); lb[a]= NULL; @@ -343,7 +345,7 @@ static ID *alloc_libblock_notest(short type) id= MEM_callocN(sizeof(Text), "text"); break; case ID_SCRIPT: - id= MEM_callocN(sizeof(Script), "script"); + //XXX id= MEM_callocN(sizeof(Script), "script"); break; case ID_SO: id= MEM_callocN(sizeof(bSound), "sound"); @@ -366,6 +368,9 @@ static ID *alloc_libblock_notest(short type) case ID_PA: id = MEM_callocN(sizeof(ParticleSettings), "ParticleSettings"); break; + case ID_WM: + id = MEM_callocN(sizeof(wmWindowManager), "Window manager"); + break; } return id; } @@ -430,6 +435,13 @@ static void free_library(Library *lib) /* no freeing needed for libraries yet */ } +static void (*free_windowmanager_cb)(bContext *, wmWindowManager *)= NULL; + +void set_free_windowmanager_cb(void (*func)(bContext *C, wmWindowManager *) ) +{ + free_windowmanager_cb= func; +} + /* used in headerbuttons.c image.c mesh.c screen.c sound.c and library.c */ void free_libblock(ListBase *lb, void *idv) { @@ -494,7 +506,7 @@ void free_libblock(ListBase *lb, void *idv) free_text((Text *)id); break; case ID_SCRIPT: - free_script((Script *)id); + //XXX free_script((Script *)id); break; case ID_SO: sound_free_sound((bSound *)id); @@ -517,6 +529,10 @@ void free_libblock(ListBase *lb, void *idv) case ID_PA: psys_free_settings((ParticleSettings *)id); break; + case ID_WM: + if(free_windowmanager_cb) + free_windowmanager_cb(NULL, (wmWindowManager *)id); + break; } if (id->properties) { diff --git a/source/blender/blenkernel/intern/material.c b/source/blender/blenkernel/intern/material.c index 27f4fd3bc05..95534deae66 100644 --- a/source/blender/blenkernel/intern/material.c +++ b/source/blender/blenkernel/intern/material.c @@ -47,7 +47,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" @@ -860,7 +859,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 79205814ae7..d84ad0a5215 100644 --- a/source/blender/blenkernel/intern/mball.c +++ b/source/blender/blenkernel/intern/mball.c @@ -50,7 +50,6 @@ #include "BLI_arithb.h" #include "BKE_utildefines.h" -#include "BKE_bad_level_calls.h" #include "BKE_global.h" #include "BKE_main.h" @@ -120,7 +119,7 @@ MetaBall *copy_mball(MetaBall *mb) mbn= copy_libblock(mb); - duplicatelist(&mbn->elems, &mb->elems); + BLI_duplicatelist(&mbn->elems, &mb->elems); mbn->mat= MEM_dupallocN(mb->mat); for(a=0; a<mbn->totcol; a++) { @@ -288,6 +287,7 @@ int is_basis_mball(Object *ob) */ Object *find_basis_mball(Object *basis) { + extern ListBase editelems; /* editmball.c */ Base *base; Object *ob,*bob= basis; MetaElem *ml=NULL; @@ -1454,6 +1454,7 @@ void polygonize(PROCESS *mbproc, MetaBall *mb) float init_meta(Object *ob) /* return totsize */ { + extern ListBase editelems; /* editmball.c */ Base *base; Object *bob; MetaBall *mb; diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c index 77b9ea4fa2d..07a1a5c5f44 100644 --- a/source/blender/blenkernel/intern/mesh.c +++ b/source/blender/blenkernel/intern/mesh.c @@ -69,7 +69,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 6bdd395a2ac..eebd5e6d056 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -77,7 +77,6 @@ #include "BKE_main.h" #include "BKE_anim.h" -#include "BKE_bad_level_calls.h" #include "BKE_bmesh.h" #include "BKE_booleanops.h" #include "BKE_cloth.h" @@ -107,13 +106,15 @@ #include "BKE_shrinkwrap.h" #include "BKE_simple_deform.h" -#include "LOD_DependKludge.h" +//XXX #include "LOD_DependKludge.h" #include "LOD_decimation.h" #include "CCGSubSurf.h" #include "RE_shader_ext.h" +//XXX #include "BIF_meshlaplacian.h" + /***/ static int noneModifier_isDisabled(ModifierData *md) @@ -4055,6 +4056,8 @@ static void decimateModifier_copyData(ModifierData *md, ModifierData *target) tdmd->percent = dmd->percent; } +//XXX +#if 0 static DerivedMesh *decimateModifier_applyModifier( ModifierData *md, Object *ob, DerivedMesh *derivedData, int useRenderParams, int isFinalCalc) @@ -4173,6 +4176,7 @@ static DerivedMesh *decimateModifier_applyModifier( exit: return result; } +#endif /* Smooth */ @@ -7586,7 +7590,7 @@ static void meshdeformModifier_do( /* progress bar redraw can make this recursive .. */ if(!recursive) { recursive = 1; - harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat); + //XXX harmonic_coordinates_bind(mmd, vertexCos, numVerts, cagemat); recursive = 0; } } @@ -8131,7 +8135,7 @@ ModifierTypeInfo *modifierType_getInfo(ModifierType type) mti->flags = eModifierTypeFlag_AcceptsMesh; mti->initData = decimateModifier_initData; mti->copyData = decimateModifier_copyData; - mti->applyModifier = decimateModifier_applyModifier; + //XXX mti->applyModifier = decimateModifier_applyModifier; mti = INIT_TYPE(Smooth); mti->type = eModifierTypeType_OnlyDeform; @@ -8414,7 +8418,7 @@ void modifiers_clearErrors(Object *ob) } } - if (qRedraw) allqueue(REDRAWBUTSEDIT, 0); +// XXX if (qRedraw) allqueue(REDRAWBUTSEDIT, 0); } void modifiers_foreachObjectLink(Object *ob, ObjectWalkFunc walk, @@ -8480,7 +8484,7 @@ void modifier_setError(ModifierData *md, char *format, ...) md->error = BLI_strdup(buffer); - allqueue(REDRAWBUTSEDIT, 0); +// XXX allqueue(REDRAWBUTSEDIT, 0); } /* used for buttons, to find out if the 'draw deformed in editmode' option is diff --git a/source/blender/blenkernel/intern/multires-firstlevel.c b/source/blender/blenkernel/intern/multires-firstlevel.c index 3d417565eb1..8c667a9ecf0 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 <string.h> 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 4d312632b1a..96e81c604fa 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,8 +44,7 @@ #include "BKE_global.h" #include "BKE_multires.h" -#include "blendef.h" -#include "editmesh.h" +//XXX #include "editmesh.h" #include <math.h> @@ -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, CustomData *fdata, int findex, Ed tmp.v3= efa->v3->tmp.l; tmp.v4= 0; if(efa->v4) tmp.v4= efa->v4->tmp.l; - test_index_face(&tmp, fdata, findex, efa->v4?4:3); + //XXX test_index_face(&tmp, fdata, findex, 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"); @@ -1037,7 +1034,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 */ @@ -1092,11 +1089,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) @@ -1107,7 +1104,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); @@ -1273,7 +1270,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/nla.c b/source/blender/blenkernel/intern/nla.c index 245c4179bd1..dc2bf26759f 100644 --- a/source/blender/blenkernel/intern/nla.c +++ b/source/blender/blenkernel/intern/nla.c @@ -73,7 +73,7 @@ void copy_actionstrip (bActionStrip **dst, bActionStrip **src){ dstrip->ipo->id.us++; if (dstrip->modifiers.first) { - duplicatelist (&dstrip->modifiers, &sstrip->modifiers); + BLI_duplicatelist (&dstrip->modifiers, &sstrip->modifiers); } } @@ -84,7 +84,7 @@ void copy_nlastrips (ListBase *dst, ListBase *src) dst->first=dst->last=NULL; - duplicatelist (dst, src); + BLI_duplicatelist (dst, src); /* Update specific data */ if (!dst->first) @@ -97,7 +97,7 @@ void copy_nlastrips (ListBase *dst, ListBase *src) strip->ipo->id.us++; if (strip->modifiers.first) { ListBase listb; - duplicatelist (&listb, &strip->modifiers); + BLI_duplicatelist (&listb, &strip->modifiers); strip->modifiers= listb; } } diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index b881b681ed9..8d60b1b4359 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -943,7 +943,7 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node, int internal) *nnode= *node; BLI_addtail(&ntree->nodes, nnode); - duplicatelist(&nnode->inputs, &node->inputs); + BLI_duplicatelist(&nnode->inputs, &node->inputs); oldsock= node->inputs.first; for(sock= nnode->inputs.first; sock; sock= sock->next, oldsock= oldsock->next) { oldsock->new_sock= sock; @@ -951,7 +951,7 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node, int internal) sock->own_index= 0; } - duplicatelist(&nnode->outputs, &node->outputs); + BLI_duplicatelist(&nnode->outputs, &node->outputs); oldsock= node->outputs.first; for(sock= nnode->outputs.first; sock; sock= sock->next, oldsock= oldsock->next) { if(internal) diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index a25afeafaef..2d7a5283b0c 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" @@ -117,8 +116,6 @@ #include "GPU_material.h" -#include "blendef.h" - /* Local function protos */ static void solve_parenting (Object *ob, Object *par, float obmat[][4], float slowmat[][4], int simul); @@ -1417,7 +1414,7 @@ void object_make_proxy(Object *ob, Object *target, Object *gob) ob->actcol= ob->totcol= 0; if(ob->mat) MEM_freeN(ob->mat); ob->mat = NULL; - if ((target->totcol) && (target->mat) && OB_SUPPORT_MATERIAL(ob)) { + if ((target->totcol) && (target->mat) && ELEM5(ob->type, OB_MESH, OB_CURVE, OB_SURF, OB_FONT, OB_MBALL)) { //XXX OB_SUPPORT_MATERIAL int i; ob->colbits = target->colbits; @@ -1717,7 +1714,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 && !found) { diff --git a/source/blender/blenkernel/intern/packedFile.c b/source/blender/blenkernel/intern/packedFile.c index f6a65bd72a5..22e4e8a8309 100644 --- a/source/blender/blenkernel/intern/packedFile.c +++ b/source/blender/blenkernel/intern/packedFile.c @@ -61,7 +61,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) { @@ -180,7 +179,7 @@ PackedFile * newPackedFile(char * filename) char name[FILE_MAXDIR+FILE_MAXFILE]; void * data; - waitcursor(1); + //XXX waitcursor(1); // convert relative filenames to absolute filenames @@ -210,7 +209,7 @@ PackedFile * newPackedFile(char * filename) close(file); } - waitcursor(0); + //XXX waitcursor(0); return (pf); } @@ -283,7 +282,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); @@ -306,28 +305,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) != 0) { - 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) != 0) { - 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); } @@ -450,7 +449,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 44ee5c236fa..32da154321e 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -72,13 +72,11 @@ #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 "BKE_pointcache.h" -#include "blendef.h" #include "RE_render_ext.h" static void key_from_object(Object *ob, ParticleKey *key); @@ -289,7 +287,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) { @@ -394,7 +392,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); @@ -2353,7 +2351,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 39226faff1e..6d8d6c233ac 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -58,7 +58,6 @@ #include "BLI_threads.h" #include "BKE_anim.h" -#include "BKE_bad_level_calls.h" #include "BKE_cdderivedmesh.h" #include "BKE_collision.h" #include "BKE_displist.h" @@ -80,10 +79,6 @@ #include "PIL_time.h" -#include "BSE_headerbuttons.h" - -#include "blendef.h" - #include "RE_shader_ext.h" /* fluid sim particle import */ @@ -965,7 +960,7 @@ int psys_threads_init_distribution(ParticleThread *threads, DerivedMesh *finaldm return 0; if (!finaldm->deformedOnly && !CustomData_has_layer( &finaldm->faceData, CD_ORIGINDEX ) ) { - error("Can't paint with the current modifier stack, disable destructive modifiers"); +// XXX error("Can't paint with the current modifier stack, disable destructive modifiers"); return 0; } @@ -1555,9 +1550,9 @@ void initialize_particle(ParticleData *pa, int p, Object *ob, ParticleSystem *ps pa->lifetime= part->lifetime*ptex.life; if(part->type==PART_HAIR) - pa->time=0.0f; + pa->time= 0.0f; else if(part->type==PART_REACTOR && (part->flag&PART_REACT_STA_END)==0) - pa->time=MAXFRAMEF; + pa->time= 300000.0f; /* max frame */ else{ //icu=find_ipocurve(psys->part->ipo,PART_EMIT_TIME); //if(icu){ @@ -4191,7 +4186,7 @@ static void hair_step(Object *ob, ParticleSystemModifierData *psmd, ParticleSyst precalc_effectors(ob,psys,psmd,cfra); 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); } @@ -4690,7 +4685,7 @@ void particle_system_update(Object *ob, ParticleSystem *psys) if(!psys_check_enabled(ob, psys)) return; - cfra= bsystem_time(ob, CFRA, 0.0f); + cfra= bsystem_time(ob, (float)G.scene->r.cfra, 0.0f); psmd= psys_get_modifier(ob, psys); /* system was already updated from modifier stack */ diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index d4676653a4e..596ac882d24 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -54,7 +54,6 @@ #include "BKE_softbody.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 d2eb058a9a0..509cd8cf750 100644 --- a/source/blender/blenkernel/intern/property.c +++ b/source/blender/blenkernel/intern/property.c @@ -44,9 +44,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 47d11bb9d29..e8c6c5c199f 100644 --- a/source/blender/blenkernel/intern/sca.c +++ b/source/blender/blenkernel/intern/sca.c @@ -37,7 +37,6 @@ #include <string.h> #include "MEM_guardedalloc.h" -#include "nla.h" /* For __NLA: Important, do not remove */ #include "DNA_text_types.h" #include "DNA_controller_types.h" #include "DNA_sensor_types.h" @@ -45,13 +44,14 @@ #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" #include "BKE_blender.h" #include "BKE_sca.h" +//#include "wm_event_types.h" + void free_text_controllers(Text *txt) { Object *ob; @@ -158,7 +158,7 @@ void init_sensor(bSensor *sens) break; case SENS_MOUSE: ms=sens->data= MEM_callocN(sizeof(bMouseSensor), "mousesens"); - ms->type= LEFTMOUSE; + //XXX ms->type= LEFTMOUSE; break; case SENS_COLLISION: sens->data= MEM_callocN(sizeof(bCollisionSensor), "colsens"); @@ -195,7 +195,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; } @@ -319,7 +319,7 @@ bController *new_controller(int type) init_controller(cont); strcpy(cont->name, "cont"); - make_unique_prop_names(cont->name); +// XXX make_unique_prop_names(cont->name); return cont; } @@ -491,7 +491,7 @@ bActuator *new_actuator(int type) init_actuator(act); strcpy(act->name, "act"); - make_unique_prop_names(act->name); +// XXX make_unique_prop_names(act->name); return act; } diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c index 1727edc10fc..096c04b7bd3 100644 --- a/source/blender/blenkernel/intern/scene.c +++ b/source/blender/blenkernel/intern/scene.c @@ -60,7 +60,7 @@ #include "BKE_action.h" #include "BKE_anim.h" #include "BKE_armature.h" -#include "BKE_bad_level_calls.h" +#include "BKE_colortools.h" #include "BKE_colortools.h" #include "BKE_constraint.h" #include "BKE_depsgraph.h" @@ -79,8 +79,8 @@ #include "BKE_world.h" #include "BKE_utildefines.h" -#include "BIF_previewrender.h" -#include "BIF_editseq.h" +//XXX #include "BIF_previewrender.h" +//XXX #include "BIF_editseq.h" #ifndef DISABLE_PYTHON #include "BPY_extern.h" @@ -89,7 +89,7 @@ #include "BLI_arithb.h" #include "BLI_blenlib.h" -#include "nla.h" +//XXX #include "nla.h" #ifdef WIN32 #else @@ -138,7 +138,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; @@ -325,7 +325,7 @@ void set_scene_bg(Scene *sce) int flag; // Note: this here is defined in editseq.c (BIF_editseq.h), NOT in blenkernel! - clear_last_seq(); + //XXX clear_last_seq(); G.scene= sce; @@ -387,7 +387,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 7a45493e1f4..bf2ed2c658e 100644 --- a/source/blender/blenkernel/intern/screen.c +++ b/source/blender/blenkernel/intern/screen.c @@ -1,6 +1,4 @@ - -/* screen.c - * +/* * $Id$ * * ***** BEGIN GPL LICENSE BLOCK ***** @@ -34,21 +32,105 @@ #include <math.h> #include "DNA_screen_types.h" -#include "BKE_bad_level_calls.h" +#include "DNA_space_types.h" #include "BLI_blenlib.h" #include "BKE_screen.h" -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif +#include "BPY_extern.h" + +/* keep global; this has to be accessible outside of windowmanager */ +static ListBase spacetypes= {NULL, NULL}; + +SpaceType *BKE_spacetype_from_id(int spaceid) +{ + SpaceType *st; + + for(st= spacetypes.first; st; st= st->next) { + if(st->spaceid==spaceid) + return st; + } + return NULL; +} + +const ListBase *BKE_spacetypes_list() +{ + return &spacetypes; +} + +void BKE_spacetype_register(SpaceType *st) +{ + BLI_addtail(&spacetypes, st); +} + +void BKE_spacedata_freelist(ListBase *lb) +{ + SpaceLink *sl; + + for (sl= lb->first; sl; sl= sl->next) { + SpaceType *st= BKE_spacetype_from_id(sl->spacetype); + + if(st && st->free) + st->free(sl); + } + + BLI_freelistN(lb); +} + +/* lb1 should be empty */ +void BKE_spacedata_copylist(ListBase *lb1, ListBase *lb2) +{ + SpaceLink *sl; + + lb1->first= lb2->last= NULL; /* to be sure */ + + for (sl= lb2->first; sl; sl= sl->next) { + SpaceType *st= BKE_spacetype_from_id(sl->spacetype); + + if(st && st->duplicate) + BLI_addtail(lb1, st->duplicate(sl)); + } +} + +/* not region itself */ +void BKE_area_region_free(ARegion *ar) +{ + if(ar->type && ar->type->free) + ar->type->free(ar); +} + +/* not area itself */ +void BKE_screen_area_free(ScrArea *sa) +{ + ARegion *ar; + + for(ar=sa->regionbase.first; ar; ar=ar->next) + BKE_area_region_free(ar); + + BKE_spacedata_freelist(&sa->spacedata); + + BLI_freelistN(&sa->regionbase); + BLI_freelistN(&sa->actionzones); + + BLI_freelistN(&sa->panels); + // uiFreeBlocks(&sa->uiblocks); + // uiFreePanels(&sa->panels); + + BPY_free_scriptlink(&sa->scriptlink); + +} /* don't free screen itself */ void free_screen(bScreen *sc) { - unlink_screen(sc); - + ScrArea *sa; + + for(sa= sc->areabase.first; sa; sa= sa->next) + BKE_screen_area_free(sa); + BLI_freelistN(&sc->vertbase); BLI_freelistN(&sc->edgebase); BLI_freelistN(&sc->areabase); } + + diff --git a/source/blender/blenkernel/intern/script.c b/source/blender/blenkernel/intern/script.c index 6145f6c3063..e34b1d0a1dd 100644 --- a/source/blender/blenkernel/intern/script.c +++ b/source/blender/blenkernel/intern/script.c @@ -35,7 +35,6 @@ #include "DNA_space_types.h" #include "MEM_guardedalloc.h" -#include "BKE_bad_level_calls.h" /* for BPY_clear_script */ /* #include "BLI_blenlib.h" @@ -47,15 +46,14 @@ #ifndef DISABLE_PYTHON #include "BPY_extern.h" // Blender Python library #endif - -#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). */ + +//XXX +#if 0 void free_script (Script *script) { if (!script) return; @@ -63,3 +61,4 @@ void free_script (Script *script) BPY_clear_script(script); #endif } +#endif diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c index 5d93f10526a..1ae547ba7b8 100644 --- a/source/blender/blenkernel/intern/softbody.c +++ b/source/blender/blenkernel/intern/softbody.c @@ -83,8 +83,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" // #include "ONL_opennl.h" remove linking to ONL for now diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index f79009e673d..f5124ed9056 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -41,7 +41,6 @@ #include "DNA_object_types.h" #include "DNA_scene_types.h" -#include "BKE_bad_level_calls.h" #include "BKE_cdderivedmesh.h" #include "BKE_customdata.h" #include "BKE_DerivedMesh.h" @@ -881,8 +880,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; } @@ -2098,7 +2097,7 @@ static void ccgDM_drawMappedFaces(DerivedMesh *dm, int (*setDrawOptions)(void *u if (draw) { if (draw==2) { glEnable(GL_POLYGON_STIPPLE); - glPolygonStipple(stipple_quarttone); + glPolygonStipple(0); //XXX stipple_quarttone); } for (S=0; S<numVerts; S++) { diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c index d33721541f8..d1d252ab210 100644 --- a/source/blender/blenkernel/intern/text.c +++ b/source/blender/blenkernel/intern/text.c @@ -40,7 +40,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" @@ -1169,7 +1168,7 @@ int txt_find_string(Text *text, char *findstr, int wrap) void txt_cut_sel (Text *text) { if (!G.background) /* Python uses txt_cut_sel, which it should not, working around for now */ - txt_copy_clipboard(text); + ; //XXX txt_copy_clipboard(text); txt_delete_sel(text); txt_make_dirty(text); @@ -1558,7 +1557,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; @@ -1571,7 +1570,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; @@ -1605,7 +1604,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; @@ -1648,7 +1647,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; @@ -1869,7 +1868,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; @@ -2082,7 +2081,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 ab9e6f9af41..372c51b0da5 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" @@ -177,8 +176,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; } @@ -723,7 +722,7 @@ void make_local_texture(Tex *tex) void autotexname(Tex *tex) { -/* extern char texstr[20][12]; *//* buttons.c, already in bad lev calls*/ + extern char texstr[20][12]; /* buttons.c */ Image *ima; char di[FILE_MAXDIR], fi[FILE_MAXFILE]; diff --git a/source/blender/blenkernel/intern/verse_bitmap_node.c b/source/blender/blenkernel/intern/verse_bitmap_node.c index 24295cd3ad0..92bdd28027f 100644 --- a/source/blender/blenkernel/intern/verse_bitmap_node.c +++ b/source/blender/blenkernel/intern/verse_bitmap_node.c @@ -33,7 +33,7 @@ #include "BLI_dynamiclist.h" #include "BLI_blenlib.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_verse.h" @@ -219,10 +219,10 @@ VBitmapData *create_bitmap_data() vbitmap->image = NULL; - vbitmap->post_bitmap_dimension_set = post_bitmap_dimension_set; - vbitmap->post_bitmap_layer_create = post_bitmap_layer_create; - vbitmap->post_bitmap_layer_destroy = post_bitmap_layer_destroy; - vbitmap->post_bitmap_tile_set = post_bitmap_tile_set; + //XXX vbitmap->post_bitmap_dimension_set = post_bitmap_dimension_set; + //XXX vbitmap->post_bitmap_layer_create = post_bitmap_layer_create; + //XXX vbitmap->post_bitmap_layer_destroy = post_bitmap_layer_destroy; + //XXX vbitmap->post_bitmap_tile_set = post_bitmap_tile_set; return vbitmap; } diff --git a/source/blender/blenkernel/intern/verse_geometry_node.c b/source/blender/blenkernel/intern/verse_geometry_node.c index 010e42d5cb7..a0afd1ef5f0 100644 --- a/source/blender/blenkernel/intern/verse_geometry_node.c +++ b/source/blender/blenkernel/intern/verse_geometry_node.c @@ -37,7 +37,7 @@ #include "BKE_verse.h" #include "BKE_utildefines.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "verse.h" @@ -917,8 +917,8 @@ VLayer *create_verse_layer( vlayer->flag = 0; /* set up methods */ - vlayer->post_layer_create = post_layer_create; - vlayer->post_layer_destroy = post_layer_destroy; + //XXX vlayer->post_layer_create = post_layer_create; + //XXX vlayer->post_layer_destroy = post_layer_destroy; return vlayer; } @@ -942,16 +942,16 @@ VGeomData *create_geometry_data(void) geom->hash = MEM_callocN(VEDHASHSIZE*sizeof(HashVerseEdge), "verse hashedge tab"); /* set up methods */ - geom->post_vertex_create = post_vertex_create; - geom->post_vertex_set_xyz = post_vertex_set_xyz; - geom->post_vertex_delete = post_vertex_delete; - geom->post_vertex_free_constraint = post_vertex_free_constraint; - geom->post_polygon_create = post_polygon_create; - geom->post_polygon_set_corner = post_polygon_set_corner; - geom->post_polygon_delete = post_polygon_delete; - geom->post_polygon_free_constraint = post_polygon_free_constraint; - geom->post_geometry_free_constraint = post_geometry_free_constraint; - geom->post_polygon_set_uint8 = post_polygon_set_uint8; + //XXX geom->post_vertex_create = post_vertex_create; + //XXX geom->post_vertex_set_xyz = post_vertex_set_xyz; + //XXX geom->post_vertex_delete = post_vertex_delete; + //XXX geom->post_vertex_free_constraint = post_vertex_free_constraint; + //XXX geom->post_polygon_create = post_polygon_create; + //XXX geom->post_polygon_set_corner = post_polygon_set_corner; + //XXX geom->post_polygon_delete = post_polygon_delete; + //XXX geom->post_polygon_free_constraint = post_polygon_free_constraint; + //XXX geom->post_geometry_free_constraint = post_geometry_free_constraint; + //XXX geom->post_polygon_set_uint8 = post_polygon_set_uint8; return geom; } diff --git a/source/blender/blenkernel/intern/verse_method.c b/source/blender/blenkernel/intern/verse_method.c index 30886782019..b95b302f6c6 100644 --- a/source/blender/blenkernel/intern/verse_method.c +++ b/source/blender/blenkernel/intern/verse_method.c @@ -36,9 +36,8 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" -#include "BKE_bad_level_calls.h" #include "BKE_library.h" #include "BKE_text.h" #include "BKE_verse.h" @@ -493,7 +492,7 @@ static void cb_o_method_call(void *user_data, VNodeID node_id, uint8 group_id, u if(text) { txt_insert_buf(text, showstr); txt_move_eof(text, 0); - allqueue(REDRAWCHAT, 0); +// XXX allqueue(REDRAWCHAT, 0); } else { printf("%s> %s: %s\n",arg[0].vstring, arg[1].vstring, arg[2].vstring); } diff --git a/source/blender/blenkernel/intern/verse_node.c b/source/blender/blenkernel/intern/verse_node.c index 1fe86f24d6e..ee47896474a 100644 --- a/source/blender/blenkernel/intern/verse_node.c +++ b/source/blender/blenkernel/intern/verse_node.c @@ -34,7 +34,7 @@ #include "BLI_dynamiclist.h" #include "BLI_blenlib.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_verse.h" @@ -206,8 +206,8 @@ static VTagGroup *create_verse_taggroup(VNode *vnode, uint16 group_id, const cha BLI_dlist_init(&(taggroup->tags)); taggroup->queue.first = taggroup->queue.last = NULL; - taggroup->post_tag_change = post_tag_change; - taggroup->post_taggroup_create = post_taggroup_create; + //XXX taggroup->post_tag_change = post_tag_change; + //XXX taggroup->post_taggroup_create = post_taggroup_create; return taggroup; } @@ -341,9 +341,9 @@ VNode* create_verse_node(VerseSession *session, VNodeID node_id, uint8 type, VNo vnode->chat_flag = CHAT_NOTLOGGED; #endif - vnode->post_node_create = post_node_create; - vnode->post_node_destroy = post_node_destroy; - vnode->post_node_name_set = post_node_name_set; + //XXX vnode->post_node_create = post_node_create; + //XXX vnode->post_node_destroy = post_node_destroy; + //XXX vnode->post_node_name_set = post_node_name_set; return vnode; } diff --git a/source/blender/blenkernel/intern/verse_object_node.c b/source/blender/blenkernel/intern/verse_object_node.c index 89f9f0edcbd..e7827c8dc46 100644 --- a/source/blender/blenkernel/intern/verse_object_node.c +++ b/source/blender/blenkernel/intern/verse_object_node.c @@ -36,7 +36,7 @@ #include "BLI_blenlib.h" #include "BLI_arithb.h" -#include "BIF_verse.h" +//XXX #include "BIF_verse.h" #include "BKE_verse.h" #include "BKE_utildefines.h" @@ -244,8 +244,8 @@ VLink *create_verse_link( vlink->flag = 0; - vlink->post_link_set = post_link_set; - vlink->post_link_destroy = post_link_destroy; + //XXX vlink->post_link_set = post_link_set; + //XXX vlink->post_link_destroy = post_link_destroy; return vlink; } @@ -318,10 +318,10 @@ VObjectData *create_object_data(void) /* set up pointers at post callback functions */ /* obj->post_transform = post_transform;*/ - obj->post_transform_pos = post_transform_pos; - obj->post_transform_rot = post_transform_rot; - obj->post_transform_scale = post_transform_scale; - obj->post_object_free_constraint = post_object_free_constraint; + //XXX obj->post_transform_pos = post_transform_pos; + //XXX obj->post_transform_rot = post_transform_rot; + //XXX obj->post_transform_scale = post_transform_scale; + //XXX obj->post_object_free_constraint = post_object_free_constraint; return obj; } diff --git a/source/blender/blenkernel/intern/verse_session.c b/source/blender/blenkernel/intern/verse_session.c index 28a9ef85536..9771c8a46de 100644 --- a/source/blender/blenkernel/intern/verse_session.c +++ b/source/blender/blenkernel/intern/verse_session.c @@ -36,8 +36,8 @@ #include "BLI_dynamiclist.h" #include "BLI_blenlib.h" -#include "BIF_screen.h" -#include "BIF_verse.h" +//XXX #include "BIF_screen.h" +//XXX #include "BIF_verse.h" #include "BKE_global.h" #include "BKE_verse.h" @@ -104,7 +104,7 @@ static void add_verse_server(VMSServer *server) printf("Adding new verse server: %s at %s\n", newserver->name, newserver->ip); BLI_addtail(&server_list, newserver); - post_server_add(); + //XXX post_server_add(); } /* @@ -363,11 +363,11 @@ VerseSession *create_verse_session( session->queue.first = session->queue.last = NULL; /* set up all client dependent functions */ - session->post_connect_accept = post_connect_accept; - session->post_connect_terminated = post_connect_terminated; - session->post_connect_update = post_connect_update; + //XXX session->post_connect_accept = post_connect_accept; + //XXX session->post_connect_terminated = post_connect_terminated; + //XXX session->post_connect_update = post_connect_update; - post_server_add(); + //XXX post_server_add(); return session; } @@ -439,7 +439,7 @@ void b_verse_ms_get(void) if(cb_ping_registered==0) { /* handle ping messages (for master server) */ verse_callback_set(verse_send_ping, cb_ping, NULL); - add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); + //XXX add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); cb_ping_registered++; } free_all_servers(); @@ -468,8 +468,9 @@ void b_verse_connect(char *address) BLI_addtail(&session_list, session); /* add verse handler if this is first session */ - if(session_list.first == session_list.last) - add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); + if(session_list.first == session_list.last) { + //XXX add_screenhandler(G.curscreen, SCREEN_HANDLER_VERSE, 1); + } } } diff --git a/source/blender/blenkernel/intern/world.c b/source/blender/blenkernel/intern/world.c index 2e89ce3f805..bef372e39f1 100644 --- a/source/blender/blenkernel/intern/world.c +++ b/source/blender/blenkernel/intern/world.c @@ -45,7 +45,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/writeavi.c b/source/blender/blenkernel/intern/writeavi.c index 44004eeee80..e63588e6d7f 100644 --- a/source/blender/blenkernel/intern/writeavi.c +++ b/source/blender/blenkernel/intern/writeavi.c @@ -50,10 +50,6 @@ #include "quicktime_export.h" #endif -#if defined(_WIN32) && !defined(FREE_WINDOWS) -#include "BIF_writeavicodec.h" -#endif - #ifdef WITH_FFMPEG #include "BKE_writeffmpeg.h" #endif @@ -78,9 +74,9 @@ bMovieHandle *BKE_get_movie_handle(int imtype) #endif #if defined(_WIN32) && !defined(FREE_WINDOWS) if (imtype == R_AVICODEC) { - mh.start_movie= start_avi_codec; - mh.append_movie= append_avi_codec; - mh.end_movie= end_avi_codec; + //XXX mh.start_movie= start_avi_codec; + //XXX mh.append_movie= append_avi_codec; + //XXX mh.end_movie= end_avi_codec; } #endif #ifdef WITH_QUICKTIME diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index cef6f802729..7008f254871 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -57,17 +57,13 @@ #include "MEM_guardedalloc.h" #include "BLI_blenlib.h" -#include "BKE_bad_level_calls.h" #include "BKE_global.h" #include "BKE_idprop.h" #include "IMB_imbuf_types.h" #include "IMB_imbuf.h" -#include "BSE_seqaudio.h" - #include "DNA_scene_types.h" -#include "blendef.h" #ifdef HAVE_CONFIG_H #include <config.h> @@ -133,9 +129,9 @@ static int write_audio_frame(void) c = get_codec_from_stream(audio_stream); - audiostream_fill(audio_input_buffer, - audio_input_frame_size - * sizeof(short) * c->channels); + //XXX audiostream_fill(audio_input_buffer, + // audio_input_frame_size + // * sizeof(short) * c->channels); av_init_packet(&pkt); @@ -154,7 +150,7 @@ static int write_audio_frame(void) pkt.stream_index = audio_stream->index; pkt.flags |= PKT_FLAG_KEY; if (av_interleaved_write_frame(outfile, &pkt) != 0) { - error("Error writing audio packet"); + //XXX error("Error writing audio packet"); return -1; } return 0; @@ -276,7 +272,7 @@ static void write_video_frame(AVFrame* frame) } else ret = 0; if (ret != 0) { G.afbreek = 1; - error("Error writing frame"); + //XXX error("Error writing frame"); } } @@ -294,7 +290,7 @@ static AVFrame* generate_video_frame(uint8_t* pixels) rgb_frame = alloc_picture(PIX_FMT_RGBA32, width, height); if (!rgb_frame) { G.afbreek=1; - error("Couldn't allocate temporary frame"); + //XXX error("Couldn't allocate temporary frame"); return NULL; } } else { @@ -520,7 +516,8 @@ static AVStream* alloc_video_stream(int codec_id, AVFormatContext* of, set_ffmpeg_properties(c, "video"); if (avcodec_open(c, codec) < 0) { - error("Couldn't initialize codec"); + // + //XXX error("Couldn't initialize codec"); return NULL; } @@ -559,14 +556,14 @@ static AVStream* alloc_audio_stream(int codec_id, AVFormatContext* of) c->channels = 2; codec = avcodec_find_encoder(c->codec_id); if (!codec) { - error("Couldn't find a valid audio codec"); + //XXX error("Couldn't find a valid audio codec"); return NULL; } set_ffmpeg_properties(c, "audio"); if (avcodec_open(c, codec) < 0) { - error("Couldn't initialize audio codec"); + //XXX error("Couldn't initialize audio codec"); return NULL; } @@ -644,20 +641,20 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) exts = get_file_extensions(ffmpeg_type); if (!exts) { G.afbreek = 1; /* Abort render */ - error("No valid formats found"); + //XXX error("No valid formats found"); return; } fmt = guess_format(NULL, exts[0], NULL); if (!fmt) { G.afbreek = 1; /* Abort render */ - error("No valid formats found"); + //XXX error("No valid formats found"); return; } of = av_alloc_format_context(); if (!of) { G.afbreek = 1; - error("Error opening output file"); + //XXX error("Error opening output file"); return; } @@ -707,20 +704,20 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) if (fmt->video_codec == CODEC_ID_DVVIDEO) { if (rectx != 720) { G.afbreek = 1; - error("Render width has to be 720 pixels for DV!"); + //XXX error("Render width has to be 720 pixels for DV!"); return; } if (G.scene->r.frs_sec != 25 && recty != 480) { G.afbreek = 1; - error("Render height has to be 480 pixels " - "for DV-NTSC!"); + //XXX error("Render height has to be 480 pixels " + // "for DV-NTSC!"); return; } if (G.scene->r.frs_sec == 25 && recty != 576) { G.afbreek = 1; - error("Render height has to be 576 pixels " - "for DV-PAL!"); + //XXX error("Render height has to be 576 pixels " + // "for DV-PAL!"); return; } } @@ -732,8 +729,8 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) if (ffmpeg_multiplex_audio && G.scene->audio.mixrate != 48000) { G.afbreek = 1; - error("FFMPEG only supports 48khz / stereo " - "audio for DV!"); + //XXX error("FFMPEG only supports 48khz / stereo " + // "audio for DV!"); return; } } @@ -741,7 +738,7 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) video_stream = alloc_video_stream(fmt->video_codec, of, rectx, recty); if (!video_stream) { G.afbreek = 1; - error("Error initializing video stream"); + //XXX error("Error initializing video stream"); return; } @@ -749,20 +746,21 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) audio_stream = alloc_audio_stream(fmt->audio_codec, of); if (!audio_stream) { G.afbreek = 1; - error("Error initializing audio stream"); + //XXX error("Error initializing audio stream"); return; } - audiostream_play(SFRA, 0, 1); + //XXX audiostream_play(SFRA, 0, 1); } if (av_set_parameters(of, NULL) < 0) { G.afbreek = 1; - error("Error setting output parameters"); + //XXX error("Error setting output parameters"); return; } if (!(fmt->flags & AVFMT_NOFILE)) { if (url_fopen(&of->pb, name, URL_WRONLY) < 0) { G.afbreek = 1; - error("Could not open file for writing"); + // + //XXX error("Could not open file for writing"); return; } } @@ -778,8 +776,15 @@ void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty) /* Get the output filename-- similar to the other output formats */ void makeffmpegstring(char* string) { - + + // XXX quick define, solve! +#define FILE_MAXDIR 256 +#define FILE_MAXFILE 126 + char txt[FILE_MAXDIR+FILE_MAXFILE]; + // XXX +#undef FILE_MAXDIR +#undef FILE_MAXFILE char autosplit[20]; const char ** exts = get_file_extensions(G.scene->r.ffcodecdata.type); diff --git a/source/blender/blenkernel/intern/writeframeserver.c b/source/blender/blenkernel/intern/writeframeserver.c index 40e1dc1bb03..64bf5f85d23 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 <config.h> @@ -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; |