moved more minor changes across from trunk, fixed some incorrect merges and removed unused includes.

22 files changed, 16 insertions, 43 deletions

diff --git a/source/blender/blenkernel/intern/BME_tools.c b/source/blender/blenkernel/intern/BME_tools.c
index 744276db146..1543532c8bd 100644
--- a/source/blender/blenkernel/intern/BME_tools.c
+++ b/source/blender/blenkernel/intern/BME_tools.c
@@ -45,7 +45,6 @@
 #include "DNA_object_types.h"
 
 #include "BLI_math.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "BKE_bmesh.h"
diff --git a/source/blender/blenkernel/intern/anim.c b/source/blender/blenkernel/intern/anim.c
index ec74391533b..f64d49f249a 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -52,8 +52,6 @@
 #include "DNA_key_types.h"
 #include "DNA_meshdata_types.h"
 #include "DNA_scene_types.h"
-#include "DNA_windowmanager_types.h"
-#include "DNA_view3d_types.h"
 #include "DNA_vfont_types.h"
 
 #include "BKE_animsys.h"
diff --git a/source/blender/blenkernel/intern/armature.c b/source/blender/blenkernel/intern/armature.c
index 3f361fe6b66..fd25ebe266f 100644
--- a/source/blender/blenkernel/intern/armature.c
+++ b/source/blender/blenkernel/intern/armature.c
@@ -41,7 +41,6 @@
 
 #include "BLI_math.h"
 #include "BLI_blenlib.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_anim_types.h"
diff --git a/source/blender/blenkernel/intern/blender.c b/source/blender/blenkernel/intern/blender.c
index 29b3bd59e70..5b79f07f84d 100644
--- a/source/blender/blenkernel/intern/blender.c
+++ b/source/blender/blenkernel/intern/blender.c
@@ -456,8 +456,6 @@ static int read_undosave(bContext *C, UndoElem *uel)
 
 	BLI_strncpy(mainstr, G.main->name, sizeof(mainstr));	/* temporal store */
 
-	strcpy(mainstr, G.main->name);	/* temporal store */
-
 	fileflags= G.fileflags;
 	G.fileflags |= G_FILE_NO_UI;
 
diff --git a/source/blender/blenkernel/intern/constraint.c b/source/blender/blenkernel/intern/constraint.c
index b93362b8676..3f1c897b63f 100644
--- a/source/blender/blenkernel/intern/constraint.c
+++ b/source/blender/blenkernel/intern/constraint.c
@@ -44,7 +44,6 @@
 #include "BLI_listbase.h"
 #include "BLI_math.h"
 #include "BLI_editVert.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_armature_types.h"
diff --git a/source/blender/blenkernel/intern/fluidsim.c b/source/blender/blenkernel/intern/fluidsim.c
index fb15f0bffdb..b25c4a21884 100644
--- a/source/blender/blenkernel/intern/fluidsim.c
+++ b/source/blender/blenkernel/intern/fluidsim.c
@@ -67,6 +67,7 @@
 
 /* ************************* fluidsim bobj file handling **************************** */
 
+
 //-------------------------------------------------------------------------------
 // file handling
 //-------------------------------------------------------------------------------
diff --git a/source/blender/blenkernel/intern/font.c b/source/blender/blenkernel/intern/font.c
index 1931946f0cf..6898615c753 100644
--- a/source/blender/blenkernel/intern/font.c
+++ b/source/blender/blenkernel/intern/font.c
@@ -258,7 +258,7 @@ static PackedFile *get_builtin_packedfile(void)
 void free_ttfont(void)
 {
 	struct TmpFont *tf;
-	
+
 	for(tf= ttfdata.first; tf; tf= tf->next) {
 		if(tf->pf) freePackedFile(tf->pf); /* NULL when the font file can't be found on disk */
 		tf->pf= NULL;
diff --git a/source/blender/blenkernel/intern/idcode.c b/source/blender/blenkernel/intern/idcode.c
index 8c8a693e6e7..641eb0b7e76 100755
--- a/source/blender/blenkernel/intern/idcode.c
+++ b/source/blender/blenkernel/intern/idcode.c
@@ -1,5 +1,5 @@
 /*
- * $Id$
+ * $Id: idcode.c 35493 2011-03-12 14:38:00Z campbellbarton $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/key.c b/source/blender/blenkernel/intern/key.c
index 06145f09488..a345cedec90 100644
--- a/source/blender/blenkernel/intern/key.c
+++ b/source/blender/blenkernel/intern/key.c
@@ -67,7 +67,6 @@
 
 
 #include "RNA_access.h"
-#include "BLI_cellalloc.h"
 
 #define KEY_MODE_DUMMY		0 /* use where mode isn't checked for */
 #define KEY_MODE_BPOINT		1
diff --git a/source/blender/blenkernel/intern/lattice.c b/source/blender/blenkernel/intern/lattice.c
index fece1b8fb02..f0ac7040deb 100644
--- a/source/blender/blenkernel/intern/lattice.c
+++ b/source/blender/blenkernel/intern/lattice.c
@@ -45,7 +45,6 @@
 
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 
 #include "DNA_mesh_types.h"
diff --git a/source/blender/blenkernel/intern/modifiers_bmesh.c b/source/blender/blenkernel/intern/modifiers_bmesh.c
index b415b09daa4..7b6e843e74e 100644
--- a/source/blender/blenkernel/intern/modifiers_bmesh.c
+++ b/source/blender/blenkernel/intern/modifiers_bmesh.c
@@ -46,7 +46,6 @@
 #include "BLI_edgehash.h"
 #include "BLI_ghash.h"
 #include "BLI_memarena.h"
-#include "BLI_cellalloc.h"
 
 #include "MEM_guardedalloc.h"
 
diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c
index ae90d3df3e4..ba2434bba23 100644
--- a/source/blender/blenkernel/intern/node.c
+++ b/source/blender/blenkernel/intern/node.c
@@ -3654,4 +3654,5 @@ void clear_scene_in_nodes(Main *bmain, Scene *sce)
 			}
 		}
 	}
-}
\ No newline at end of file
+}
+
diff --git a/source/blender/blenkernel/intern/sca.c b/source/blender/blenkernel/intern/sca.c
index 4ee7ee501e1..16cef67ea6d 100644
--- a/source/blender/blenkernel/intern/sca.c
+++ b/source/blender/blenkernel/intern/sca.c
@@ -594,15 +594,6 @@ void set_sca_new_poins_ob(Object *ob)
 				bPropertyActuator *pa= act->data;
 				ID_NEW(pa->ob);
 			}
-			else if(act->type==ACT_ARMATURE) {
-				bArmatureActuator *aa = act->data;
-				ID_NEW(aa->target);
-				ID_NEW(aa->subtarget);
-			}
-			else if(act->type==ACT_PROPERTY) {
-				bPropertyActuator *pa= act->data;
-				ID_NEW(pa->ob);
-			}
 		}
 		act= act->next;
 	}
diff --git a/source/blender/blenkernel/intern/seqcache.c b/source/blender/blenkernel/intern/seqcache.c
index 6f329433580..5ac6bb47705 100755
--- a/source/blender/blenkernel/intern/seqcache.c
+++ b/source/blender/blenkernel/intern/seqcache.c
@@ -1,5 +1,5 @@
 /*
-* $Id$
+* $Id: seqcache.c 36197 2011-04-17 10:05:27Z schlaile $
  *
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
diff --git a/source/blender/blenkernel/intern/softbody.c b/source/blender/blenkernel/intern/softbody.c
index 23c0d875dee..ce45407a75e 100644
--- a/source/blender/blenkernel/intern/softbody.c
+++ b/source/blender/blenkernel/intern/softbody.c
@@ -71,7 +71,6 @@ variables on the UI for now
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 #include "BLI_threads.h"
-#include "BLI_cellalloc.h"
 
 #include "BKE_curve.h"
 #include "BKE_effect.h"
diff --git a/source/blender/blenkernel/intern/sound.c b/source/blender/blenkernel/intern/sound.c
index 1756227260f..e0e456a371e 100644
--- a/source/blender/blenkernel/intern/sound.c
+++ b/source/blender/blenkernel/intern/sound.c
@@ -454,8 +454,8 @@ void sound_seek_scene(struct bContext *C)
 		AUD_resume(scene->sound_scene_handle);
 		if(AUD_getStatus(scene->sound_scrub_handle) != AUD_STATUS_INVALID)
 			AUD_seek(scene->sound_scrub_handle, 0);
-		//XXX merge EEK! else
-			//scene->sound_scrub_handle = AUD_pauseAfter(scene->sound_scene_handle, 1 / FPS);
+		else
+			scene->sound_scrub_handle = AUD_pauseAfter(scene->sound_scene_handle, 1 / FPS);
 	}
 	else
 	{
diff --git a/source/blender/blenlib/intern/pbvh.c b/source/blender/blenlib/intern/pbvh.c
index 5372adbf399..e9a0ddd4825 100644
--- a/source/blender/blenlib/intern/pbvh.c
+++ b/source/blender/blenlib/intern/pbvh.c
@@ -1405,8 +1405,7 @@ int BLI_pbvh_node_raycast(PBVH *bvh, PBVHNode *node, float (*origco)[3],
 	return hit;
 }
 
-//#include "BIF_gl.h"
-//#include "BIF_glutil.h"
+//#include <GL/glew.h>
 
 void BLI_pbvh_node_draw(PBVHNode *node, void *UNUSED(data))
 {
diff --git a/source/blender/blenlib/intern/rct.c b/source/blender/blenlib/intern/rct.c
index c520375945f..cf65539bd68 100644
--- a/source/blender/blenlib/intern/rct.c
+++ b/source/blender/blenlib/intern/rct.c
@@ -43,8 +43,6 @@
 #include <math.h>
 
 #include "DNA_vec_types.h"
-#include <stdio.h>
-#include <math.h>
 #include "BLI_rect.h"
 
 int BLI_rcti_is_empty(rcti * rect)
diff --git a/source/blender/editors/sculpt_paint/paint_vertex.c b/source/blender/editors/sculpt_paint/paint_vertex.c
index 7807bb0195c..4f77ecf8287 100644
--- a/source/blender/editors/sculpt_paint/paint_vertex.c
+++ b/source/blender/editors/sculpt_paint/paint_vertex.c
@@ -46,7 +46,6 @@
 #include "BLI_blenlib.h"
 #include "BLI_math.h"
 #include "BLI_memarena.h"
-#include "BLI_cellalloc.h"
 #include "BLI_utildefines.h"
 #include "BLI_ghash.h"
 
diff --git a/source/blender/editors/space_api/spacetypes.c b/source/blender/editors/space_api/spacetypes.c
index cb89b92336f..015d8d1dee5 100644
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@ -40,7 +40,6 @@
 
 #include "BKE_context.h"
 #include "BKE_screen.h"
-#include "BKE_tessmesh.h"
 
 #include "bmesh.h"
 
diff --git a/source/blender/editors/space_outliner/outliner.c b/source/blender/editors/space_outliner/outliner.c
index 115e7a2c032..0e574ca5ffb 100644
--- a/source/blender/editors/space_outliner/outliner.c
+++ b/source/blender/editors/space_outliner/outliner.c
@@ -5757,7 +5757,7 @@ void draw_outliner(const bContext *C)
 	outliner_back(ar);
 	block= uiBeginBlock(C, ar, "outliner buttons", UI_EMBOSS);
 	outliner_draw_tree((bContext *)C, block, scene, ar, soops);
-
+	
 	if(ELEM(soops->outlinevis, SO_DATABLOCKS, SO_USERDEF)) {
 		/* draw rna buttons */
 		outliner_draw_rnacols(ar, sizex_rna);
@@ -5775,9 +5775,6 @@ void draw_outliner(const bContext *C)
 	/* draw edit buttons if nessecery */
 	outliner_buttons(C, block, ar, soops, &soops->tree);	
 
-	/* draw edit buttons if nessecery */
-	outliner_buttons(C, block, ar, soops, &soops->tree);	
-
 	uiEndBlock(C, block);
 	uiDrawBlock(C, block);
 	
diff --git a/source/blender/editors/space_view3d/view3d_edit.c b/source/blender/editors/space_view3d/view3d_edit.c
index 051a972df35..2509ae75744 100644
--- a/source/blender/editors/space_view3d/view3d_edit.c
+++ b/source/blender/editors/space_view3d/view3d_edit.c
@@ -55,7 +55,6 @@
 #include "BKE_paint.h"
 #include "BKE_report.h"
 #include "BKE_scene.h"
-#include "BKE_tessmesh.h"
 
 
 #include "BIF_gl.h"
@@ -1686,7 +1685,7 @@ static int viewselected_exec(bContext *C, wmOperator *UNUSED(op)) /* like a loca
 	INIT_MINMAX(min, max);
 
 	if (ob && ob->mode & OB_MODE_WEIGHT_PAINT) {
-		/* hardcoded exception, we look for the one selectedW armature */
+		/* hardcoded exception, we look for the one selected armature */
 		/* this is weak code this way, we should make a generic active/selection callback interface once... */
 		Base *base;
 		for(base=scene->base.first; base; base= base->next) {
@@ -2182,18 +2181,18 @@ static void axis_set_view(bContext *C, View3D *v3d, ARegion *ar, float q1, float
 
 	if(align_active==FALSE) {
 		/* normal operation */
-	if(rv3d->viewlock) {
-		/* only pass on if */
+		if(rv3d->viewlock) {
+			/* only pass on if */
 			if(rv3d->view==RV3D_VIEW_FRONT && view==RV3D_VIEW_BACK);
 			else if(rv3d->view==RV3D_VIEW_BACK && view==RV3D_VIEW_FRONT);
 			else if(rv3d->view==RV3D_VIEW_RIGHT && view==RV3D_VIEW_LEFT);
 			else if(rv3d->view==RV3D_VIEW_LEFT && view==RV3D_VIEW_RIGHT);
 			else if(rv3d->view==RV3D_VIEW_BOTTOM && view==RV3D_VIEW_TOP);
 			else if(rv3d->view==RV3D_VIEW_TOP && view==RV3D_VIEW_BOTTOM);
-		else return;
-	}
+			else return;
+		}
 
-	rv3d->view= view;
+		rv3d->view= view;
 	}
 
 	if(rv3d->viewlock) {