6 files changed, 7 insertions, 14 deletions
diff --git a/source/blender/blenkernel/BKE_group.h b/source/blender/blenkernel/BKE_group.h
index 554314c419a..044a40658c3 100644
--- a/source/blender/blenkernel/BKE_group.h
+++ b/source/blender/blenkernel/BKE_group.h
@@ -52,8 +52,10 @@ int			group_is_animated(struct Object *parent, struct Group *group);
 
 void		group_tag_recalc(struct Group *group);
 void		group_handle_recalc_and_update(struct Scene *scene, struct Object *parent, struct Group *group);
+#if 0 /* UNUSED */
 struct Object *group_get_member_with_action(struct Group *group, struct bAction *act);
 void		group_relink_nla_objects(struct Object *ob);
+#endif
 
 #endif
 
diff --git a/source/blender/blenkernel/intern/group.c b/source/blender/blenkernel/intern/group.c
index 76c3e6e5502..d0f09857781 100644
--- a/source/blender/blenkernel/intern/group.c
+++ b/source/blender/blenkernel/intern/group.c
@@ -123,8 +123,10 @@ void unlink_group(Group *group)
 		for(psys=ob->particlesystem.first; psys; psys=psys->next){
 			if(psys->part->dup_group==group)
 				psys->part->dup_group= NULL;
+#if 0		/* not used anymore, only keps for readfile.c, no need to account for this */
 			if(psys->part->eff_group==group)
 				psys->part->eff_group= NULL;
+#endif
 		}
 	}
 	
@@ -381,6 +383,7 @@ void group_handle_recalc_and_update(Scene *scene, Object *UNUSED(parent), Group
 	}
 }
 
+#if 0
 Object *group_get_member_with_action(Group *group, bAction *act)
 {
 	GroupObject *go;
@@ -432,3 +435,4 @@ void group_relink_nla_objects(Object *ob)
 	}
 }
 
+#endif
diff --git a/source/blender/blenkernel/intern/mesh.c b/source/blender/blenkernel/intern/mesh.c
index ab45aeed8c3..736c24e2c06 100644
--- a/source/blender/blenkernel/intern/mesh.c
+++ b/source/blender/blenkernel/intern/mesh.c
@@ -106,9 +106,7 @@ void unlink_mesh(Mesh *me)
 	}
 
 	if(me->key) {
-		   me->key->id.us--;
-		if (me->key->id.us == 0 && me->key->ipo )
-			me->key->ipo->id.us--;
+		me->key->id.us--;
 	}
 	me->key= NULL;
 	
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c
index eaa840ad0f9..13b6919683c 100644
--- a/source/blender/blenkernel/intern/object.c
+++ b/source/blender/blenkernel/intern/object.c
@@ -1397,7 +1397,6 @@ void object_make_proxy(Object *ob, Object *target, Object *gob)
 	ob->matbits= NULL;
 	if ((target->totcol) && (target->mat) && OB_TYPE_SUPPORT_MATERIAL(ob->type)) {
 		int i;
-		ob->colbits = target->colbits;
 		
 		ob->actcol= target->actcol;
 		ob->totcol= target->totcol;
diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index c284ed02868..ebe360ef91b 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -394,10 +394,6 @@ Scene *add_scene(const char *name)
 	sce->r.simplify_shadowsamples= 16;
 	sce->r.simplify_aosss= 1.0f;
 
-	sce->r.cineonblack= 95;
-	sce->r.cineonwhite= 685;
-	sce->r.cineongamma= 1.7f;
-
 	sce->r.border.xmin= 0.0f;
 	sce->r.border.ymin= 0.0f;
 	sce->r.border.xmax= 1.0f;
diff --git a/source/blender/blenkernel/intern/text.c b/source/blender/blenkernel/intern/text.c
index 28d68892a2a..60cc029bf6e 100644
--- a/source/blender/blenkernel/intern/text.c
+++ b/source/blender/blenkernel/intern/text.c
@@ -479,17 +479,11 @@ void unlink_text(Main *bmain, Text *text)
 	bScreen *scr;
 	ScrArea *area;
 	SpaceLink *sl;
-	Scene *scene;
 	Object *ob;
 	bController *cont;
 	bConstraint *con;
 	short update;
 
-	/* dome */
-	for(scene=bmain->scene.first; scene; scene=scene->id.next)
-		if(scene->r.dometext == text)
-			scene->r.dometext = NULL;
-
 	for(ob=bmain->object.first; ob; ob=ob->id.next) {
 		/* game controllers */
 		for(cont=ob->controllers.first; cont; cont=cont->next) {