From 25135a201b32f4c579758bfdd33fab36c0b12a7c Mon Sep 17 00:00:00 2001 From: Ton Roosendaal Date: Mon, 24 Dec 2007 19:13:04 +0000 Subject: - removing conflicts in svn merge (didnt notice) - adding more Makefiles --- source/blender/Makefile | 8 +- source/blender/blenkernel/BKE_bad_level_calls.h | 159 --------------------- source/blender/blenkernel/BKE_blender.h | 5 - source/blender/blenkernel/Makefile | 2 +- source/blender/blenkernel/intern/particle_system.c | 2 +- 5 files changed, 6 insertions(+), 170 deletions(-) (limited to 'source') diff --git a/source/blender/Makefile b/source/blender/Makefile index 2c1f83edf39..819735400db 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -33,12 +33,12 @@ include nan_definitions.mk -DIRS = blenloader readblenfile +DIRS = windowmanager blenloader readblenfile DIRS += avi imbuf render radiosity blenlib blenkernel blenpluginapi -DIRS += makesdna src yafray -DIRS += python nodes +DIRS += makesdna yafray +DIRS += nodes -ifeq ($(WITH_FREETYPE2), true) +ifeq ($(INTERNATIONAL), true) DIRS += ftfont endif diff --git a/source/blender/blenkernel/BKE_bad_level_calls.h b/source/blender/blenkernel/BKE_bad_level_calls.h index c24dd2cf6cf..d80d4ee5a17 100644 --- a/source/blender/blenkernel/BKE_bad_level_calls.h +++ b/source/blender/blenkernel/BKE_bad_level_calls.h @@ -39,7 +39,6 @@ extern ListBase editNurb; -#include "radio.h" #include "BIF_editmesh.h" #include "BIF_editmesh.h" #include "BIF_editfont.h" @@ -53,163 +52,5 @@ extern ListBase editNurb; #include "BSE_sequence.h" - - -<<<<<<< .mine -======= -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); - -/* image.c */ -#include "DNA_image_types.h" -void free_realtime_image(Image *ima); // has to become a callback, opengl stuff - -/* 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); -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); - -/* multires.c */ -struct Multires; -struct MultiresLevel; -struct MultiresLevel *multires_level_n(struct Multires *mr, int n); -void multires_free(struct Multires *mr); -void multires_set_level(struct Object *ob, struct Mesh *me, const int render); -void multires_update_levels(struct Mesh *me, const int render); -void multires_calc_level_maps(struct MultiresLevel *lvl); -struct Multires *multires_copy(struct Multires *orig); -/* sculptmode.c */ -struct SculptData; -void sculpt_reset_curve(struct SculptData *sd); -void sculptmode_free_all(struct Scene *sce); -void sculptmode_init(struct Scene *sce); - -/* 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); - ->>>>>>> .r12991 #endif diff --git a/source/blender/blenkernel/BKE_blender.h b/source/blender/blenkernel/BKE_blender.h index 245d61f3f7e..472aa4eb834 100644 --- a/source/blender/blenkernel/BKE_blender.h +++ b/source/blender/blenkernel/BKE_blender.h @@ -44,13 +44,8 @@ struct ListBase; struct MemFile; struct bContext; -<<<<<<< .mine #define BLENDER_VERSION 250 #define BLENDER_SUBVERSION 0 -======= -#define BLENDER_VERSION 245 -#define BLENDER_SUBVERSION 12 ->>>>>>> .r12991 #define BLENDER_MINVERSION 250 #define BLENDER_MINSUBVERSION 0 diff --git a/source/blender/blenkernel/Makefile b/source/blender/blenkernel/Makefile index 239941ec59b..0713d7af196 100644 --- a/source/blender/blenkernel/Makefile +++ b/source/blender/blenkernel/Makefile @@ -32,6 +32,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/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index db571f01b1e..7b3747503c7 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -4418,7 +4418,7 @@ static void system_step(Object *ob, ParticleSystem *psys, ParticleSystemModifier /* this is a bad level call, but currently type change * can happen after redraw, so force redraw from here */ - allqueue(REDRAWBUTSOBJECT, 0); +// allqueue(REDRAWBUTSOBJECT, 0); } else oldtotpart = psys->totpart; -- cgit v1.2.3