- player building again
- fix for compiler warnigns - bpath reporting was incorrect
This commit is contained in:
parent
49fc1f9860
commit
a3e461ce1b
|
@ -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);
|
||||
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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]};
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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){}
|
||||
|
|
Loading…
Reference in New Issue