[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [18347] branches/blender2.5/blender/source : 2.5
Ton Roosendaal
ton at blender.org
Mon Jan 5 18:20:44 CET 2009
Revision: 18347
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18347
Author: ton
Date: 2009-01-05 18:20:40 +0100 (Mon, 05 Jan 2009)
Log Message:
-----------
2.5
Cleanup:
- Makefile was using confused link order, now all intern and
and extern libs are put after blender and editor libs
- Old stubs.c in editors/screen removed. The leftover python
stubs calls were moved to python module.
Modified Paths:
--------------
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c
branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/python/intern/stubs.c
Removed Paths:
-------------
branches/blender2.5/blender/source/blender/editors/screen/stubs.c
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2009-01-05 17:09:30 UTC (rev 18346)
+++ branches/blender2.5/blender/source/Makefile 2009-01-05 17:20:40 UTC (rev 18347)
@@ -82,8 +82,6 @@
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 += $(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 @@
# 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 @@
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 @@
@$(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
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c 2009-01-05 17:09:30 UTC (rev 18346)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/curve.c 2009-01-05 17:20:40 UTC (rev 18347)
@@ -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,
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2009-01-05 17:09:30 UTC (rev 18346)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/modifier.c 2009-01-05 17:20:40 UTC (rev 18347)
@@ -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"
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c 2009-01-05 17:09:30 UTC (rev 18346)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/texture.c 2009-01-05 17:20:40 UTC (rev 18347)
@@ -732,7 +732,9 @@
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];
Modified: branches/blender2.5/blender/source/blender/editors/armature/poseobject.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-01-05 17:09:30 UTC (rev 18346)
+++ branches/blender2.5/blender/source/blender/editors/armature/poseobject.c 2009-01-05 17:20:40 UTC (rev 18347)
@@ -157,26 +157,6 @@
}
-#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)
Deleted: branches/blender2.5/blender/source/blender/editors/screen/stubs.c
===================================================================
--- branches/blender2.5/blender/source/blender/editors/screen/stubs.c 2009-01-05 17:09:30 UTC (rev 18346)
+++ branches/blender2.5/blender/source/blender/editors/screen/stubs.c 2009-01-05 17:20:40 UTC (rev 18347)
@@ -1,83 +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) 2007 Blender Foundation.
- * All rights reserved.
- *
- *
- * Contributor(s): Blender Foundation
- *
- * ***** 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() {}
-//void BPY_start_python() {}
-void BPY_do_all_scripts() {}
-void BPY_call_importloader() {}
-void BPY_do_pyscript() {}
-void BPY_pydriver_eval() {}
-void BPY_pydriver_get_objects() {}
-void BPY_clear_script() {}
-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() {}
Added: branches/blender2.5/blender/source/blender/python/intern/stubs.c
===================================================================
--- branches/blender2.5/blender/source/blender/python/intern/stubs.c (rev 0)
+++ branches/blender2.5/blender/source/blender/python/intern/stubs.c 2009-01-05 17:20:40 UTC (rev 18347)
@@ -0,0 +1,42 @@
+/**
+ * $Id:
+ *
+ * ***** BEGIN GPL LICENSE BLOCK *****
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * The Original Code is Copyright (C) 2007 Blender Foundation.
+ * All rights reserved.
+ *
+ *
+ * Contributor(s): Blender Foundation
+ *
+ * ***** END GPL LICENSE BLOCK *****
+ */
+
+/* python, will come back */
+void BPY_post_start_python() {}
+//void BPY_run_python_script() {}
+//void BPY_start_python() {}
+void BPY_do_all_scripts() {}
+void BPY_call_importloader() {}
+void BPY_do_pyscript() {}
+void BPY_pydriver_eval() {}
+void BPY_pydriver_get_objects() {}
+void BPY_clear_script() {}
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list