[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13090] branches/blender2.5/blender/source : Some notes for those who try to follow this :)
Ton Roosendaal
ton at blender.org
Tue Jan 1 19:29:20 CET 2008
Revision: 13090
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13090
Author: ton
Date: 2008-01-01 19:29:19 +0100 (Tue, 01 Jan 2008)
Log Message:
-----------
Some notes for those who try to follow this :)
- first work on getting area/screen handling back
- added structure for where to put stuff, is still under
review, wait a bit for docs?
Campbell is working on removing every bad level include from
sources, so we can safely rebuild the src/ directory.
Modified Paths:
--------------
branches/blender2.5/blender/source/Makefile
branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h
branches/blender2.5/blender/source/blender/blenkernel/intern/action.c
branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c
branches/blender2.5/blender/source/blender/blenkernel/intern/nla.c
branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
branches/blender2.5/blender/source/blender/blenlib/BLI_blenlib.h
branches/blender2.5/blender/source/blender/blenlib/intern/util.c
branches/blender2.5/blender/source/blender/editors/area/Makefile
branches/blender2.5/blender/source/blender/editors/screen/Makefile
branches/blender2.5/blender/source/blender/editors/screen/ed_screen.c
branches/blender2.5/blender/source/blender/quicktime/apple/quicktime_export.c
branches/blender2.5/blender/source/blender/windowmanager/WM_api.h
branches/blender2.5/blender/source/blender/windowmanager/intern/wm_cursors.c
branches/blender2.5/blender/source/creator/creator.c
Added Paths:
-----------
branches/blender2.5/blender/source/blender/editors/area/space.c
branches/blender2.5/blender/source/blender/editors/include/ED_area.h
branches/blender2.5/blender/source/blender/editors/include/ED_interface.h
branches/blender2.5/blender/source/blender/editors/include/ED_mesh.h
branches/blender2.5/blender/source/blender/editors/include/ED_object.h
branches/blender2.5/blender/source/blender/editors/include/ED_screen.h
branches/blender2.5/blender/source/blender/editors/include/ED_transform.h
branches/blender2.5/blender/source/blender/editors/interface/
branches/blender2.5/blender/source/blender/editors/interface/Makefile
branches/blender2.5/blender/source/blender/editors/mesh/
branches/blender2.5/blender/source/blender/editors/mesh/Makefile
branches/blender2.5/blender/source/blender/editors/object/
branches/blender2.5/blender/source/blender/editors/object/Makefile
branches/blender2.5/blender/source/blender/editors/space_buttons/
branches/blender2.5/blender/source/blender/editors/space_file/
branches/blender2.5/blender/source/blender/editors/space_image/
branches/blender2.5/blender/source/blender/editors/space_info/
branches/blender2.5/blender/source/blender/editors/space_ipo/
branches/blender2.5/blender/source/blender/editors/space_view3d/
branches/blender2.5/blender/source/blender/editors/transform/
branches/blender2.5/blender/source/blender/editors/transform/Makefile
Property Changed:
----------------
branches/blender2.5/blender/source/blender/
Modified: branches/blender2.5/blender/source/Makefile
===================================================================
--- branches/blender2.5/blender/source/Makefile 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/Makefile 2008-01-01 18:29:19 UTC (rev 13090)
@@ -230,6 +230,7 @@
PULIB += $(OCGDIR)/blender/windowmanager/$(DEBUG_DIR)libwindowmanager.a
PULIB += $(OCGDIR)/blender/ed_datafiles/libed_datafiles.a
PULIB += $(OCGDIR)/blender/ed_screen/libed_screen.a
+PULIB += $(OCGDIR)/blender/ed_area/libed_area.a
ifeq ($(NAN_NO_KETSJI),true)
PULIB += $(NAN_MOTO)/lib/libmoto.a
Property changes on: branches/blender2.5/blender/source/blender
___________________________________________________________________
Name: svn:ignore
+ *gdb_history
Modified: branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/BKE_blender.h 2008-01-01 18:29:19 UTC (rev 13090)
@@ -54,7 +54,6 @@
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);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/action.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/action.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -187,7 +187,7 @@
if (!src) return NULL;
dst= copy_libblock(src);
- duplicatelist(&(dst->chanbase), &(src->chanbase));
+ BLI_duplicatelist(&(dst->chanbase), &(src->chanbase));
for (dchan=dst->chanbase.first, schan=src->chanbase.first; dchan; dchan=dchan->next, schan=schan->next){
dchan->ipo = copy_ipo(dchan->ipo);
@@ -268,7 +268,7 @@
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) {
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/armature.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -178,7 +178,7 @@
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;
@@ -195,7 +195,7 @@
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;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/blender.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -177,22 +177,6 @@
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)
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/constraint.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -111,7 +111,7 @@
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);
@@ -126,7 +126,7 @@
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);
@@ -1854,7 +1854,7 @@
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)
@@ -3230,7 +3230,7 @@
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);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/ipo.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -283,7 +283,7 @@
ipon= copy_libblock(ipo);
- duplicatelist(&(ipon->curve), &(ipo->curve));
+ BLI_duplicatelist(&(ipon->curve), &(ipo->curve));
for(icu= ipo->curve.first; icu; icu= icu->next) {
icu->bezt= MEM_dupallocN(icu->bezt);
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/key.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/key.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/key.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -154,7 +154,7 @@
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;
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/mball.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -122,7 +122,7 @@
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++) {
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/nla.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/nla.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -76,7 +76,7 @@
dstrip->ipo->id.us++;
if (dstrip->modifiers.first) {
- duplicatelist (&dstrip->modifiers, &sstrip->modifiers);
+ BLI_duplicatelist (&dstrip->modifiers, &sstrip->modifiers);
}
}
@@ -87,7 +87,7 @@
dst->first=dst->last=NULL;
- duplicatelist (dst, src);
+ BLI_duplicatelist (dst, src);
/* Update specific data */
if (!dst->first)
@@ -100,7 +100,7 @@
strip->ipo->id.us++;
if (strip->modifiers.first) {
ListBase listb;
- duplicatelist (&listb, &strip->modifiers);
+ BLI_duplicatelist (&listb, &strip->modifiers);
strip->modifiers= listb;
}
}
Modified: branches/blender2.5/blender/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenkernel/intern/node.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenkernel/intern/node.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -806,11 +806,11 @@
*nnode= *node;
BLI_addtail(&ntree->nodes, nnode);
- duplicatelist(&nnode->inputs, &node->inputs);
+ BLI_duplicatelist(&nnode->inputs, &node->inputs);
for(sock= nnode->inputs.first; sock; sock= sock->next)
sock->own_index= 0;
- duplicatelist(&nnode->outputs, &node->outputs);
+ BLI_duplicatelist(&nnode->outputs, &node->outputs);
for(sock= nnode->outputs.first; sock; sock= sock->next) {
sock->own_index= 0;
sock->stack_index= 0;
Modified: branches/blender2.5/blender/source/blender/blenlib/BLI_blenlib.h
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/BLI_blenlib.h 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenlib/BLI_blenlib.h 2008-01-01 18:29:19 UTC (rev 13090)
@@ -117,6 +117,9 @@
void BLI_freelist(struct ListBase *listbase);
int BLI_countlist(struct ListBase *listbase);
void BLI_freelinkN(ListBase *listbase, void *vlink);
+void BLI_duplicatelist(ListBase *list1, ListBase *list2); /* copy from 2 to 1 */
+
+
void BLI_splitdirstring(char *di,char *fi);
struct DynamicList *BLI_dlist_from_listbase(struct ListBase *lb);
Modified: branches/blender2.5/blender/source/blender/blenlib/intern/util.c
===================================================================
--- branches/blender2.5/blender/source/blender/blenlib/intern/util.c 2008-01-01 18:16:10 UTC (rev 13089)
+++ branches/blender2.5/blender/source/blender/blenlib/intern/util.c 2008-01-01 18:29:19 UTC (rev 13090)
@@ -498,6 +498,23 @@
return -1;
}
+void BLI_duplicatelist(ListBase *list1, ListBase *list2) /* copy from 2 to 1 */
+{
+ struct Link *link1, *link2;
+
+ list1->first= list1->last= 0;
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list