- player building again

- fix for compiler warnigns
- bpath reporting was incorrect

diff --git a/source/blender/blenkernel/intern/colortools.c b/source/blender/blenkernel/intern/colortools.c
index d8975c16cc81c97dd2b09b7c30a46d1f00cbd27b..09c65f4b21dbebce26cfbb76329aad1c1563bc61 100644 (file)
--- a/source/blender/blenkernel/intern/colortools.c
+++ b/source/blender/blenkernel/intern/colortools.c
@@ -768,7 +768,6 @@ void curvemapping_do_ibuf(CurveMapping *cumap, ImBuf *ibuf)
 {
        ImBuf *tmpbuf;
        int pixel;
-       char *tmpcbuf;
        float *pix_in;
        float col[3];
        int stride= 4;
@@ -816,7 +815,7 @@ void curvemapping_do_ibuf(CurveMapping *cumap, ImBuf *ibuf)
        }
        
        IMB_rect_from_float(tmpbuf);
-       SWAP(char *, tmpbuf->rect, ibuf->rect);
+       SWAP(unsigned int *, tmpbuf->rect, ibuf->rect);
        IMB_freeImBuf(tmpbuf);
        
        

diff --git a/source/blender/blenlib/intern/bpath.c b/source/blender/blenlib/intern/bpath.c
index 626c6ee8443a90b649eed01e35a913d82e174cd2..e448f6a4083d6f617957f57ce0a1d38904a75c75 100644 (file)
--- a/source/blender/blenlib/intern/bpath.c
+++ b/source/blender/blenlib/intern/bpath.c
@@ -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 @@ static void bpath_as_report(struct BPathIterator *bpi, const char *message, Repo
        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);
        }
 
 }

diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c
index 5852f8f8873c193ca72c3e01f3ae596e2d4f9c42..0cb916d74489b52b3e70c5acc16cd7100e29410a 100644 (file)
--- a/source/blender/editors/interface/interface_templates.c
+++ b/source/blender/editors/interface/interface_templates.c
@@ -1869,7 +1869,6 @@ void uiTemplateColorWheel(uiLayout *layout, PointerRNA *ptr, char *propname, int
        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);

diff --git a/source/blender/editors/object/object_add.c b/source/blender/editors/object/object_add.c
index 7af66d98df47284f591521c2eefa2b40e26d2df8..28ddf07fe8e3a354bdff2e4c662b59d34a6d7e49 100644 (file)
--- a/source/blender/editors/object/object_add.c
+++ b/source/blender/editors/object/object_add.c
@@ -363,7 +363,6 @@ void OBJECT_OT_effector_add(wmOperatorType *ot)
 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;

diff --git a/source/blender/imbuf/intern/divers.c b/source/blender/imbuf/intern/divers.c
index bcf913e6caf84ce8cbc092120de98995eb095f01..93bfec823e991d6bc23066618360dcccfd117dd6 100644 (file)
--- a/source/blender/imbuf/intern/divers.c
+++ b/source/blender/imbuf/intern/divers.c
@@ -180,7 +180,7 @@ void IMB_rect_from_float(struct ImBuf *ibuf)
 {
        /* 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 @@ void IMB_rect_from_float(struct ImBuf *ibuf)
                }
                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]};

diff --git a/source/blender/windowmanager/intern/wm_operators.c b/source/blender/windowmanager/intern/wm_operators.c
index 1d9687a2d94b99f91bfd027037e07ab8f8ffa5d3..88ac8986936aabbd350a0f41912ccfa588605fef 100644 (file)
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -934,11 +934,12 @@ static uiBlock *wm_block_create_splash(bContext *C, ARegion *ar, void *arg_unuse
        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;

diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 6c2d0b1a25bc65922de23fa991f54150072ab4d0..190b64781e25f0ac4245acb348e442e1c3501cc0 100644 (file)
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -102,6 +102,7 @@ int ED_space_image_show_render(struct SpaceImage *sima){return 0;}
 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){}