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.
  

9 files changed, 16 insertions, 32 deletions

diff --git a/source/blender/blenkernel/intern/action.c b/source/blender/blenkernel/intern/action.c
index 162ee582d74..129e9cd3f4f 100644
--- a/source/blender/blenkernel/intern/action.c
+++ b/source/blender/blenkernel/intern/action.c
@@ -187,7 +187,7 @@ bAction *copy_action (bAction *src)
 	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 @@ 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) {
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 78e8253625d..dc5ea96b58a 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -178,7 +178,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;
@@ -195,7 +195,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;
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 63aa861093e..011261dc4be 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -177,22 +177,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)
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index 66c8f1531d1..69cd82fced7 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -111,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);
@@ -126,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);
@@ -1854,7 +1854,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)
@@ -3230,7 +3230,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/ipo.c b/source/blender/blenkernel/intern/ipo.c
index 2b68d26994f..cd0478d8808 100644
--- a/source/blender/blenkernel/intern/ipo.c
+++ b/source/blender/blenkernel/intern/ipo.c
@@ -283,7 +283,7 @@ Ipo *copy_ipo(Ipo *ipo)
 	
 	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);
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 4a62c64f48a..20096831806 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -154,7 +154,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/mball.c b/source/blender/blenkernel/intern/mball.c
index 3933e2bfaa0..a7de6f2f39e 100644
--- a/source/blender/blenkernel/intern/mball.c
+++ b/source/blender/blenkernel/intern/mball.c
@@ -122,7 +122,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++) {
diff --git a/source/blender/blenkernel/intern/nla.c b/source/blender/blenkernel/intern/nla.c
index 961ea21d088..fb3ad2910b2 100644
--- a/source/blender/blenkernel/intern/nla.c
+++ b/source/blender/blenkernel/intern/nla.c
@@ -76,7 +76,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);
 	}
 	
 }
@@ -87,7 +87,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)
@@ -100,7 +100,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 651115b7180..5c9b609bbaf 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -806,11 +806,11 @@ bNode *nodeCopyNode(struct bNodeTree *ntree, struct bNode *node)
 	*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;