diff options
-rw-r--r-- | source/Makefile | 12 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 3 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/modifier.c | 5 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/texture.c | 4 | ||||
-rw-r--r-- | source/blender/editors/armature/poseobject.c | 20 | ||||
-rw-r--r-- | source/blender/python/intern/stubs.c (renamed from source/blender/editors/screen/stubs.c) | 41 |
6 files changed, 14 insertions, 71 deletions
diff --git a/source/Makefile b/source/Makefile index 464985f8d40..2cacdf27985 100644 --- a/source/Makefile +++ b/source/Makefile @@ -82,8 +82,6 @@ GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a GRPLIB += $(OCGDIR)/blender/render/$(DEBUG_DIR)librender.a GRPLIB += $(OCGDIR)/blender/radiosity/$(DEBUG_DIR)libradiosity.a -GRPLIB += $(NAN_OPENNL)/lib/$(DEBUG_DIR)libopennl.a -GRPLIB += $(NAN_SUPERLU)/lib/$(DEBUG_DIR)libsuperlu.a # nlin: the reason that some libraries appear more than once below is # to handle circular dependencies in linking among libraries... some @@ -107,6 +105,7 @@ COMLIB += $(OCGDIR)/blender/avi/$(DEBUG_DIR)libavi.a COMLIB += $(NAN_JPEG)/lib/libjpeg.a COMLIB += $(OCGDIR)/blender/gpu/$(DEBUG_DIR)libgpu.a COMLIB += $(NAN_GLEW)/lib/libglew.a +COMLIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a ifneq ($(NAN_NO_KETSJI),true) COMLIB += $(OCGDIR)/gameengine/bloutines/$(DEBUG_DIR)libbloutines.a @@ -219,7 +218,6 @@ endif # note: space_api.a in begin of editors, screen.a in end PULIB = $(NAN_MOTO)/lib/libmoto.a -PULIB += $(NAN_ELBEEM)/lib/$(DEBUG_DIR)libelbeem.a PULIB += $(OCGDIR)/blender/readblenfile/$(DEBUG_DIR)libreadblenfile.a PULIB += $(OCGDIR)/blender/ed_space/libed_space.a PULIB += $(OCGDIR)/blender/ed_sound/libed_sound.a @@ -527,13 +525,13 @@ ifeq ($(OS),windows) endif endif -$(DIR)/$(DEBUG_DIR)bin/blenderstatic: $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) +$(DIR)/$(DEBUG_DIR)bin/blenderstatic: $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) @echo "****> Link $@" ifdef NAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"static"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(SADD) $(LOPTS) + $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blenderstatic $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) $(LLIBS) $(SADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif @@ -541,13 +539,13 @@ ifeq ($(OS), darwin) @$(MAKE) -C darwin/ APPLICATION=blenderstatic endif -$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) +$(DIR)/$(DEBUG_DIR)bin/blender$(EXT): $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) @echo "****> Link $@" ifdef NAN_BUILDINFO $(CCC) $(REL_CFLAGS) -DBUILD_DATE='"$(BUILD_DATE)"' -DBUILD_TIME='"$(BUILD_TIME)"' -DBUILD_REV='"$(BUILD_REV)"' -DBUILD_PLATFORM='"$(CONFIG_GUESS)"' -DBUILD_TYPE='"dynamic"' $(BUILDINFO_C) -c -o $(BUILDINFO_O) -DNAN_BUILDINFO endif mkdir -p $(DIR)/$(DEBUG_DIR)bin - $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(COMLIB) $(PULIB) $(LLIBS) $(DADD) $(LOPTS) + $(CCC) $(LDFLAGS) -o $(DIR)/$(DEBUG_DIR)bin/blender$(EXT) $(BUILDINFO_O) $(OBJS) $(GRPLIB) $(PULIB) $(COMLIB) $(LLIBS) $(DADD) $(LOPTS) ifdef NAN_BUILDINFO /bin/rm $(BUILDINFO_O) endif diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index ccb7811cbb9..9f415b34c4a 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -68,7 +68,8 @@ /* globals */ -extern ListBase editNurb; /* editcurve.c */ +// XXX +ListBase editNurb; /* local */ int cu_isectLL(float *v1, float *v2, float *v3, float *v4, diff --git a/source/blender/blenkernel/intern/modifier.c b/source/blender/blenkernel/intern/modifier.c index fc016f0f130..b4e683afeb8 100644 --- a/source/blender/blenkernel/intern/modifier.c +++ b/source/blender/blenkernel/intern/modifier.c @@ -76,7 +76,7 @@ #include "BKE_main.h" #include "BKE_anim.h" #include "BKE_bmesh.h" -#include "BKE_booleanops.h" +// XXX #include "BKE_booleanops.h" #include "BKE_cloth.h" #include "BKE_collision.h" #include "BKE_cdderivedmesh.h" @@ -107,6 +107,9 @@ //XXX #include "LOD_DependKludge.h" #include "LOD_decimation.h" +// XXX +static struct DerivedMesh *NewBooleanDerivedMesh() {return NULL;} + #include "CCGSubSurf.h" #include "RE_shader_ext.h" diff --git a/source/blender/blenkernel/intern/texture.c b/source/blender/blenkernel/intern/texture.c index cdbd2afb421..70ced6e59d6 100644 --- a/source/blender/blenkernel/intern/texture.c +++ b/source/blender/blenkernel/intern/texture.c @@ -732,7 +732,9 @@ void make_local_texture(Tex *tex) void autotexname(Tex *tex) { - extern char texstr[20][12]; /* buttons.c */ + char texstr[20][12]= {"None" , "Clouds" , "Wood", "Marble", "Magic" , "Blend", + "Stucci", "Noise" , "Image", "Plugin", "EnvMap" , "Musgrave", + "Voronoi", "DistNoise", "", "", "", "", "", ""}; Image *ima; char di[FILE_MAXDIR], fi[FILE_MAXFILE]; diff --git a/source/blender/editors/armature/poseobject.c b/source/blender/editors/armature/poseobject.c index 324223fa212..825be74c06e 100644 --- a/source/blender/editors/armature/poseobject.c +++ b/source/blender/editors/armature/poseobject.c @@ -157,26 +157,6 @@ void exit_posemode(Scene *scene) } -#if 0 -/* called by buttons to find a bone to display/edit values for */ -bPoseChannel *get_active_posechannel (Object *ob) -{ - bArmature *arm= ob->data; - bPoseChannel *pchan; - - if ELEM(NULL, ob, ob->pose) - return NULL; - - /* find active */ - for(pchan= ob->pose->chanbase.first; pchan; pchan= pchan->next) { - if(pchan->bone && (pchan->bone->flag & BONE_ACTIVE) && (pchan->bone->layer & arm->layer)) - return pchan; - } - - return NULL; -} -#endif - /* if a selected or active bone is protected, throw error (oonly if warn==1) and return 1 */ /* only_selected==1 : the active bone is allowed to be protected */ static short pose_has_protected_selected(Object *ob, short only_selected, short warn) diff --git a/source/blender/editors/screen/stubs.c b/source/blender/python/intern/stubs.c index 896aa0c1796..ae069af5d8c 100644 --- a/source/blender/editors/screen/stubs.c +++ b/source/blender/python/intern/stubs.c @@ -26,18 +26,6 @@ * ***** END GPL LICENSE BLOCK ***** */ -#include <string.h> - -/* various UI stuff */ -void set_timecursor() {} -void mainqenter() {} - -char texstr[20][12]; - -/* global vars */ -void *editNurb; -void *editelems; - /* python, will come back */ void BPY_post_start_python() {} //void BPY_run_python_script() {} @@ -52,32 +40,3 @@ void BPY_free_compiled_text() {} void BPY_pyconstraint_eval() {} void BPY_pyconstraint_target() {} -/* areas */ -void copy_view3d_lock() {} - -/* seq */ -void do_render_seq() {} -void get_forground_frame_seq() {} - -/* sculpt */ -void sculptmode_free_all() {} -void sculptmode_init() {} - -/* mesh */ -void free_realtime_image() {} -void NewBooleanDerivedMesh() {} - -/* particle */ -void PE_recalc_world_cos() {} -void PE_free_particle_edit() {} -void PE_get_colors() {} - -/* fluid */ -void fluidsimSettingsCopy() {} -void fluidsimSettingsFree() {} - -void BIF_filelist_freelib() {} - -/* audio */ -void audiostream_play() {} -void audiostream_fill() {} |