[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25895] trunk/blender/source/blender: - player building again

[Campbell Barton]

Revision: 25895
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25895
Author:   campbellbarton
Date:     2010-01-11 11:48:41 +0100 (Mon, 11 Jan 2010)

Log Message:
-----------
- player building again
- fix for compiler warnigns
- bpath reporting was incorrect

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/colortools.c
    trunk/blender/source/blender/blenlib/intern/bpath.c
    trunk/blender/source/blender/editors/interface/interface_templates.c
    trunk/blender/source/blender/editors/object/object_add.c
    trunk/blender/source/blender/imbuf/intern/divers.c
    trunk/blender/source/blender/windowmanager/intern/wm_operators.c
    trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c

Modified: trunk/blender/source/blender/blenkernel/intern/colortools.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/colortools.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blender/blenkernel/intern/colortools.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -768,7 +768,6 @@
 {
 	ImBuf *tmpbuf;
 	int pixel;
-	char *tmpcbuf;
 	float *pix_in;
 	float col[3];
 	int stride= 4;
@@ -816,7 +815,7 @@
 	}
 	
 	IMB_rect_from_float(tmpbuf);
-	SWAP(char *, tmpbuf->rect, ibuf->rect);
+	SWAP(unsigned int *, tmpbuf->rect, ibuf->rect);
 	IMB_freeImBuf(tmpbuf);
 	
 	

Modified: trunk/blender/source/blender/blenlib/intern/bpath.c
===================================================================
--- trunk/blender/source/blender/blenlib/intern/bpath.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blender/blenlib/intern/bpath.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -62,6 +62,7 @@
 #include "BKE_main.h" /* so we can access G.main->*.first */
 #include "BKE_sequencer.h"
 #include "BKE_utildefines.h"
+#include "BKE_report.h"
 
 //XXX #include "BIF_screen.h" /* only for wait cursor */
 //
@@ -448,8 +449,8 @@
 	BLI_bpathIterator_getPathExpanded(bpi, path_expanded);
 
 	if(reports) {
-		if (name)	BKE_reportf("%s \"%s\", \"%s\": %s", prefix, name, path_expanded, message);
-		else		BKE_reportf("%s \"%s\": %s", prefix, path_expanded, message);
+		if (name)	BKE_reportf(reports, RPT_INFO, "%s \"%s\", \"%s\": %s", prefix, name, path_expanded, message);
+		else		BKE_reportf(reports, RPT_INFO, "%s \"%s\": %s", prefix, path_expanded, message);
 	}
 
 }

Modified: trunk/blender/source/blender/editors/interface/interface_templates.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface_templates.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blender/editors/interface/interface_templates.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -1869,7 +1869,6 @@
 	PropertyRNA *prop= RNA_struct_find_property(ptr, propname);
 	uiBlock *block= uiLayoutGetBlock(layout);
 	uiLayout *col, *row;
-	uiBut *but;
 	
 	if (!prop) {
 		printf("uiTemplateColorWheel: property not found: %s\n", propname);

Modified: trunk/blender/source/blender/editors/object/object_add.c
===================================================================
--- trunk/blender/source/blender/editors/object/object_add.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blender/editors/object/object_add.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -363,7 +363,6 @@
 static int object_camera_add_exec(bContext *C, wmOperator *op)
 {
 	View3D *v3d = CTX_wm_view3d(C);
-	RegionView3D *rv3d= CTX_wm_region_view3d(C);
 	Scene *scene= CTX_data_scene(C);
 	Object *ob;
 	int enter_editmode;

Modified: trunk/blender/source/blender/imbuf/intern/divers.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/divers.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blender/imbuf/intern/divers.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -180,7 +180,7 @@
 {
 	/* quick method to convert floatbuf to byte */
 	float *tof = (float *)ibuf->rect_float;
-	int do_dither = ibuf->dither != 0.f;
+//	int do_dither = ibuf->dither != 0.f;
 	float dither= ibuf->dither / 255.0;
 	float srgb[4];
 	int i, channels= ibuf->channels;
@@ -241,7 +241,6 @@
 		}
 		else {
 			if (dither != 0.f) {
-				float col[3];		
 				for (i = ibuf->x * ibuf->y; i > 0; i--, to+=4, tof+=4) {
 					const float d = (BLI_frand()-0.5)*dither;
 					const float col[4] = {d+tof[0], d+tof[1], d+tof[2], d+tof[3]};

Modified: trunk/blender/source/blender/windowmanager/intern/wm_operators.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blender/windowmanager/intern/wm_operators.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -934,11 +934,12 @@
 	uiLayout *layout, *split, *col;
 	uiStyle *style= U.uistyles.first;
 	struct RecentFile *recent;
-	int i, ver_width, rev_width;
+	int i;
+
+#ifdef NAN_BUILDINFO
+	int ver_width, rev_width;
 	char *version_str = NULL;
 	char *revision_str = NULL;
-	
-#ifdef NAN_BUILDINFO
 	char version_buf[128];
 	char revision_buf[128];
 	extern char * build_rev;

Modified: trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-01-11 10:22:24 UTC (rev 25894)
+++ trunk/blender/source/blenderplayer/bad_level_call_stubs/stubs.c	2010-01-11 10:48:41 UTC (rev 25895)
@@ -102,6 +102,7 @@
 int ED_space_image_show_paint(struct SpaceImage *sima){return 0;}
 void ED_space_image_set(struct bContext *C, struct SpaceImage *sima, struct Scene *scene, struct Object *obedit, struct Image *ima){}
 struct ImBuf *ED_space_image_buffer(struct SpaceImage *sima){return (struct ImBuf *) NULL;}
+void	ED_screen_set_scene(struct bContext *C, struct Scene *scene){}
 
 struct PTCacheEdit *PE_get_current(struct Scene *scene, struct Object *ob){return (struct PTCacheEdit *) NULL;}
 void PE_current_changed(struct Scene *scene, struct Object *ob){}