Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/source/blender/editors/space_image/image_ops.c
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/space_image/image_ops.c')
-rw-r--r--source/blender/editors/space_image/image_ops.c318
1 files changed, 160 insertions, 158 deletions
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 6d4aa63a770..5de0dd3fccd 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -96,15 +96,15 @@ static void sima_zoom_set(SpaceImage *sima, ARegion *ar, float zoom, float locat
width *= sima->zoom;
height *= sima->zoom;
- if((width < 4) && (height < 4))
+ if ((width < 4) && (height < 4))
sima->zoom= oldzoom;
- else if((ar->winrct.xmax - ar->winrct.xmin) <= sima->zoom)
+ else if ((ar->winrct.xmax - ar->winrct.xmin) <= sima->zoom)
sima->zoom= oldzoom;
- else if((ar->winrct.ymax - ar->winrct.ymin) <= sima->zoom)
+ else if ((ar->winrct.ymax - ar->winrct.ymin) <= sima->zoom)
sima->zoom= oldzoom;
}
- if((U.uiflag & USER_ZOOM_TO_MOUSEPOS) && location) {
+ if ((U.uiflag & USER_ZOOM_TO_MOUSEPOS) && location) {
float aspx, aspy, w, h;
ED_space_image_size(sima, &width, &height);
@@ -133,15 +133,15 @@ static int image_poll(bContext *C)
static int space_image_buffer_exists_poll(bContext *C)
{
SpaceImage *sima= CTX_wm_space_image(C);
- if(sima && sima->spacetype==SPACE_IMAGE)
- if(ED_space_image_has_buffer(sima))
+ if (sima && sima->spacetype==SPACE_IMAGE)
+ if (ED_space_image_has_buffer(sima))
return 1;
return 0;
}
static int space_image_file_exists_poll(bContext *C)
{
- if(space_image_buffer_exists_poll(C)) {
+ if (space_image_buffer_exists_poll(C)) {
Main *bmain= CTX_data_main(C);
SpaceImage *sima= CTX_wm_space_image(C);
ImBuf *ibuf;
@@ -150,11 +150,11 @@ static int space_image_file_exists_poll(bContext *C)
char name[FILE_MAX];
ibuf= ED_space_image_acquire_buffer(sima, &lock);
- if(ibuf) {
+ if (ibuf) {
BLI_strncpy(name, ibuf->name, FILE_MAX);
BLI_path_abs(name, bmain->name);
- if(BLI_exists(name) == FALSE) {
+ if (BLI_exists(name) == FALSE) {
CTX_wm_operator_poll_msg_set(C, "image file not found");
}
else if (BLI_file_is_writable(name) == FALSE) {
@@ -174,7 +174,7 @@ static int space_image_file_exists_poll(bContext *C)
static int space_image_poll(bContext *C)
{
SpaceImage *sima= CTX_wm_space_image(C);
- if(sima && sima->spacetype==SPACE_IMAGE && sima->image)
+ if (sima && sima->spacetype==SPACE_IMAGE && sima->image)
return 1;
return 0;
}
@@ -184,7 +184,7 @@ int space_image_main_area_poll(bContext *C)
SpaceImage *sima= CTX_wm_space_image(C);
// XXX ARegion *ar= CTX_wm_region(C);
- if(sima)
+ if (sima)
return 1; // XXX (ar && ar->type->regionid == RGN_TYPE_WINDOW);
return 0;
@@ -196,7 +196,7 @@ int space_image_main_area_not_uv_brush_poll(bContext *C)
SpaceImage *sima= CTX_wm_space_image(C);
ToolSettings *toolsettings = CTX_data_scene(C)->toolsettings;
- if(sima && !toolsettings->uvsculpt)
+ if (sima && !toolsettings->uvsculpt)
return 1;
return 0;
@@ -208,8 +208,8 @@ static int space_image_image_sample_poll(bContext *C)
Object *obedit= CTX_data_edit_object(C);
ToolSettings *toolsettings = CTX_data_scene(C)->toolsettings;
- if(obedit){
- if(ED_space_image_show_uvedit(sima, obedit) && (toolsettings->use_uv_sculpt))
+ if (obedit) {
+ if (ED_space_image_show_uvedit(sima, obedit) && (toolsettings->use_uv_sculpt))
return 0;
}
return space_image_main_area_poll(C);
@@ -244,7 +244,7 @@ static void image_view_pan_exit(bContext *C, wmOperator *op, int cancel)
SpaceImage *sima= CTX_wm_space_image(C);
ViewPanData *vpd= op->customdata;
- if(cancel) {
+ if (cancel) {
sima->xof= vpd->xof;
sima->yof= vpd->yof;
ED_region_tag_redraw(CTX_wm_region(C));
@@ -267,7 +267,7 @@ static int image_view_pan_exec(bContext *C, wmOperator *op)
/* XXX notifier? */
#if 0
- if(image_preview_active(curarea, NULL, NULL)) {
+ if (image_preview_active(curarea, NULL, NULL)) {
/* recalculates new preview rect */
scrarea_do_windraw(curarea);
image_preview_event(2);
@@ -312,7 +312,7 @@ static int image_view_pan_modal(bContext *C, wmOperator *op, wmEvent *event)
image_view_pan_exec(C, op);
break;
default:
- if(event->type==vpd->event_type && event->val==KM_RELEASE) {
+ if (event->type==vpd->event_type && event->val==KM_RELEASE) {
image_view_pan_exit(C, op, 0);
return OPERATOR_FINISHED;
}
@@ -382,7 +382,7 @@ static void image_view_zoom_exit(bContext *C, wmOperator *op, int cancel)
SpaceImage *sima= CTX_wm_space_image(C);
ViewZoomData *vpd= op->customdata;
- if(cancel) {
+ if (cancel) {
sima->zoom= vpd->zoom;
ED_region_tag_redraw(CTX_wm_region(C));
}
@@ -402,7 +402,7 @@ static int image_view_zoom_exec(bContext *C, wmOperator *op)
/* XXX notifier? */
#if 0
- if(image_preview_active(curarea, NULL, NULL)) {
+ if (image_preview_active(curarea, NULL, NULL)) {
/* recalculates new preview rect */
scrarea_do_windraw(curarea);
image_preview_event(2);
@@ -449,7 +449,7 @@ static int image_view_zoom_modal(bContext *C, wmOperator *op, wmEvent *event)
ED_region_tag_redraw(CTX_wm_region(C));
break;
default:
- if(event->type==vpd->event_type && event->val==KM_RELEASE) {
+ if (event->type==vpd->event_type && event->val==KM_RELEASE) {
image_view_zoom_exit(C, op, 0);
return OPERATOR_FINISHED;
}
@@ -570,7 +570,7 @@ static int image_view_all_exec(bContext *C, wmOperator *UNUSED(op))
width = ar->winrct.xmax - ar->winrct.xmin + 1;
height = ar->winrct.ymax - ar->winrct.ymin + 1;
- if((w >= width || h >= height) && (width > 0 && height > 0)) {
+ if ((w >= width || h >= height) && (width > 0 && height > 0)) {
/* find the zoom value that will fit the image in the image space */
zoomx= width/w;
zoomy= height/h;
@@ -623,7 +623,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
height= height*aspy;
/* get bounds */
- if(!ED_uvedit_minmax(scene, ima, obedit, min, max))
+ if (!ED_uvedit_minmax(scene, ima, obedit, min, max))
return OPERATOR_CANCELLED;
/* adjust offset and zoom */
@@ -634,7 +634,7 @@ static int image_view_selected_exec(bContext *C, wmOperator *UNUSED(op))
d[1]= max[1] - min[1];
size= 0.5f*MAX2(d[0], d[1])*MAX2(width, height)/256.0f;
- if(size<=0.01f) size= 0.01f;
+ if (size<=0.01f) size= 0.01f;
sima_zoom_set(sima, ar, 0.7f/size, NULL);
ED_region_tag_redraw(CTX_wm_region(C));
@@ -757,7 +757,7 @@ static int image_view_zoom_ratio_exec(bContext *C, wmOperator *op)
/* XXX notifier? */
#if 0
- if(image_preview_active(curarea, NULL, NULL)) {
+ if (image_preview_active(curarea, NULL, NULL)) {
/* recalculates new preview rect */
scrarea_do_windraw(curarea);
image_preview_event(2);
@@ -826,19 +826,19 @@ static int image_open_exec(bContext *C, wmOperator *op)
ima= BKE_add_image_file(str);
- if(!ima) {
- if(op->customdata) MEM_freeN(op->customdata);
+ if (!ima) {
+ if (op->customdata) MEM_freeN(op->customdata);
BKE_reportf(op->reports, RPT_ERROR, "Can't read: \"%s\", %s", str, errno ? strerror(errno) : "Unsupported image format");
return OPERATOR_CANCELLED;
}
- if(!op->customdata)
+ if (!op->customdata)
image_open_init(C, op);
/* hook into UI */
pprop= op->customdata;
- if(pprop->prop) {
+ if (pprop->prop) {
/* when creating new ID blocks, use is already 1, but RNA
* pointer se also increases user, so this compensates it */
ima->id.us--;
@@ -847,19 +847,19 @@ static int image_open_exec(bContext *C, wmOperator *op)
RNA_property_pointer_set(&pprop->ptr, pprop->prop, idptr);
RNA_property_update(C, &pprop->ptr, pprop->prop);
}
- else if(sima) {
+ else if (sima) {
ED_space_image_set(sima, scene, obedit, ima);
iuser= &sima->iuser;
}
else {
Tex *tex= CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
- if(tex && tex->type==TEX_IMAGE)
+ if (tex && tex->type==TEX_IMAGE)
iuser= &tex->iuser;
}
/* initialize because of new image */
- if(iuser) {
+ if (iuser) {
iuser->sfra= 1;
iuser->offset= 0;
iuser->fie_ima= 2;
@@ -882,20 +882,20 @@ static int image_open_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)
char *path=U.textudir;
Image *ima= NULL;
- if(sima) {
+ if (sima) {
ima= sima->image;
}
if (ima==NULL) {
Tex *tex= CTX_data_pointer_get_type(C, "texture", &RNA_Texture).data;
- if(tex && tex->type==TEX_IMAGE)
+ if (tex && tex->type==TEX_IMAGE)
ima= tex->ima;
}
- if(ima)
+ if (ima)
path= ima->name;
- if(RNA_struct_property_is_set(op->ptr, "filepath"))
+ if (RNA_struct_property_is_set(op->ptr, "filepath"))
return image_open_exec(C, op);
image_open_init(C, op);
@@ -932,7 +932,7 @@ static int image_replace_exec(bContext *C, wmOperator *op)
SpaceImage *sima= CTX_wm_space_image(C);
char str[FILE_MAX];
- if(!sima->image)
+ if (!sima->image)
return OPERATOR_CANCELLED;
RNA_string_get(op->ptr, "filepath", str);
@@ -958,13 +958,13 @@ static int image_replace_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
{
SpaceImage *sima= CTX_wm_space_image(C);
- if(!sima->image)
+ if (!sima->image)
return OPERATOR_CANCELLED;
- if(RNA_struct_property_is_set(op->ptr, "filepath"))
+ if (RNA_struct_property_is_set(op->ptr, "filepath"))
return image_replace_exec(C, op);
- if(!RNA_struct_property_is_set(op->ptr, "relative_path"))
+ if (!RNA_struct_property_is_set(op->ptr, "relative_path"))
RNA_boolean_set(op->ptr, "relative_path", (strncmp(sima->image->name, "//", 2))==0);
image_filesel(C, op, sima->image->name);
@@ -1035,13 +1035,13 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima,
void *lock;
ImBuf *ibuf= ED_space_image_acquire_buffer(sima, &lock);
- if(ibuf) {
+ if (ibuf) {
Image *ima= sima->image;
short is_depth_set= FALSE;
simopts->im_format.planes= ibuf->planes;
- if(ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
+ if (ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE)) {
/* imtype */
simopts->im_format= scene->r.im_format;
is_depth_set= TRUE;
@@ -1075,10 +1075,11 @@ static int save_image_options_init(SaveImageOptions *simopts, SpaceImage *sima,
}
/* check for empty path */
- if(guess_path && simopts->filepath[0]==0) {
+ if (guess_path && simopts->filepath[0]==0) {
if ( (G.ima[0] == '/') && (G.ima[1] == '/') && (G.ima[2] == '\0') ) {
BLI_strncpy(simopts->filepath, "//untitled", FILE_MAX);
- } else {
+ }
+ else {
BLI_strncpy(simopts->filepath, G.ima, FILE_MAX);
}
BLI_path_abs(simopts->filepath, G.main->name);
@@ -1130,27 +1131,27 @@ static void save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
WM_cursor_wait(1);
- if(ima->type == IMA_TYPE_R_RESULT) {
+ if (ima->type == IMA_TYPE_R_RESULT) {
/* enforce user setting for RGB or RGBA, but skip BW */
- if(simopts->im_format.planes==R_IMF_PLANES_RGBA) {
+ if (simopts->im_format.planes==R_IMF_PLANES_RGBA) {
ibuf->planes= R_IMF_PLANES_RGBA;
}
- else if(simopts->im_format.planes==R_IMF_PLANES_RGB) {
+ else if (simopts->im_format.planes==R_IMF_PLANES_RGB) {
ibuf->planes= R_IMF_PLANES_RGB;
}
}
else {
/* TODO, better solution, if a 24bit image is painted onto it may contain alpha */
- if(ibuf->userflags & IB_BITMAPDIRTY) { /* it has been painted onto */
+ if (ibuf->userflags & IB_BITMAPDIRTY) { /* it has been painted onto */
/* checks each pixel, not ideal */
ibuf->planes= BKE_alphatest_ibuf(ibuf) ? 32 : 24;
}
}
- if(simopts->im_format.imtype==R_IMF_IMTYPE_MULTILAYER) {
+ if (simopts->im_format.imtype==R_IMF_IMTYPE_MULTILAYER) {
Scene *scene= CTX_data_scene(C);
RenderResult *rr= BKE_image_acquire_renderresult(scene, ima);
- if(rr) {
+ if (rr) {
RE_WriteRenderResult(op->reports, rr, simopts->filepath, simopts->im_format.quality);
ok= TRUE;
}
@@ -1166,8 +1167,8 @@ static void save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
}
if (ok) {
- if(!save_copy) {
- if(do_newpath) {
+ if (!save_copy) {
+ if (do_newpath) {
BLI_strncpy(ibuf->name, simopts->filepath, sizeof(ibuf->name));
BLI_strncpy(ima->name, simopts->filepath, sizeof(ima->name));
}
@@ -1175,28 +1176,28 @@ static void save_image_doit(bContext *C, SpaceImage *sima, wmOperator *op, SaveI
ibuf->userflags &= ~IB_BITMAPDIRTY;
/* change type? */
- if(ima->type==IMA_TYPE_R_RESULT) {
+ if (ima->type==IMA_TYPE_R_RESULT) {
ima->type= IMA_TYPE_IMAGE;
/* workaround to ensure the render result buffer is no longer used
* by this image, otherwise can crash when a new render result is
* created. */
- if(ibuf->rect && !(ibuf->mall & IB_rect))
+ if (ibuf->rect && !(ibuf->mall & IB_rect))
imb_freerectImBuf(ibuf);
- if(ibuf->rect_float && !(ibuf->mall & IB_rectfloat))
+ if (ibuf->rect_float && !(ibuf->mall & IB_rectfloat))
imb_freerectfloatImBuf(ibuf);
- if(ibuf->zbuf && !(ibuf->mall & IB_zbuf))
+ if (ibuf->zbuf && !(ibuf->mall & IB_zbuf))
IMB_freezbufImBuf(ibuf);
- if(ibuf->zbuf_float && !(ibuf->mall & IB_zbuffloat))
+ if (ibuf->zbuf_float && !(ibuf->mall & IB_zbuffloat))
IMB_freezbuffloatImBuf(ibuf);
}
- if( ELEM(ima->source, IMA_SRC_GENERATED, IMA_SRC_VIEWER)) {
+ if ( ELEM(ima->source, IMA_SRC_GENERATED, IMA_SRC_VIEWER)) {
ima->source= IMA_SRC_FILE;
ima->type= IMA_TYPE_IMAGE;
}
/* only image path, never ibuf */
- if(relative) {
+ if (relative) {
BLI_path_rel(ima->name, relbase); /* only after saving */
}
}
@@ -1247,7 +1248,7 @@ static int image_save_as_check(bContext *UNUSED(C), wmOperator *op)
ImageFormatData *imf= op->customdata;
char filepath[FILE_MAX];
RNA_string_get(op->ptr, "filepath", filepath);
- if(BKE_add_image_extension(filepath, imf->imtype)) {
+ if (BKE_add_image_extension(filepath, imf->imtype)) {
RNA_string_set(op->ptr, "filepath", filepath);
return TRUE;
}
@@ -1261,7 +1262,7 @@ static int image_save_as_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
Scene *scene= CTX_data_scene(C);
SaveImageOptions simopts;
- if(RNA_struct_property_is_set(op->ptr, "filepath"))
+ if (RNA_struct_property_is_set(op->ptr, "filepath"))
return image_save_as_exec(C, op);
if (save_image_options_init(&simopts, sima, scene, TRUE) == 0)
@@ -1269,7 +1270,7 @@ static int image_save_as_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(eve
save_image_options_to_op(&simopts, op);
/* enable save_copy by default for render results */
- if(ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE) && !RNA_struct_property_is_set(op->ptr, "copy")) {
+ if (ELEM(ima->type, IMA_TYPE_R_RESULT, IMA_TYPE_COMPOSITE) && !RNA_struct_property_is_set(op->ptr, "copy")) {
RNA_boolean_set(op->ptr, "copy", TRUE);
}
@@ -1387,32 +1388,32 @@ static int image_save_sequence_exec(bContext *C, wmOperator *op)
int tot= 0;
char di[FILE_MAX], fi[FILE_MAX];
- if(sima->image==NULL)
+ if (sima->image==NULL)
return OPERATOR_CANCELLED;
- if(sima->image->source!=IMA_SRC_SEQUENCE) {
+ if (sima->image->source!=IMA_SRC_SEQUENCE) {
BKE_report(op->reports, RPT_ERROR, "Can only save sequence on image sequences");
return OPERATOR_CANCELLED;
}
- if(sima->image->type==IMA_TYPE_MULTILAYER) {
+ if (sima->image->type==IMA_TYPE_MULTILAYER) {
BKE_report(op->reports, RPT_ERROR, "Can't save multilayer sequences");
return OPERATOR_CANCELLED;
}
/* get total */
- for(ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next)
- if(ibuf->userflags & IB_BITMAPDIRTY)
+ for (ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next)
+ if (ibuf->userflags & IB_BITMAPDIRTY)
tot++;
- if(tot==0) {
+ if (tot==0) {
BKE_report(op->reports, RPT_WARNING, "No images have been changed");
return OPERATOR_CANCELLED;
}
/* get a filename for menu */
- for(ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next)
- if(ibuf->userflags & IB_BITMAPDIRTY)
+ for (ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next)
+ if (ibuf->userflags & IB_BITMAPDIRTY)
break;
BLI_strncpy(di, ibuf->name, FILE_MAX);
@@ -1420,14 +1421,14 @@ static int image_save_sequence_exec(bContext *C, wmOperator *op)
BKE_reportf(op->reports, RPT_INFO, "%d Image(s) will be saved in %s", tot, di);
- for(ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next) {
- if(ibuf->userflags & IB_BITMAPDIRTY) {
+ for (ibuf= sima->image->ibufs.first; ibuf; ibuf= ibuf->next) {
+ if (ibuf->userflags & IB_BITMAPDIRTY) {
char name[FILE_MAX];
BLI_strncpy(name, ibuf->name, sizeof(name));
BLI_path_abs(name, bmain->name);
- if(0 == IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat)) {
+ if (0 == IMB_saveiff(ibuf, name, IB_rect | IB_zbuf | IB_zbuffloat)) {
BKE_reportf(op->reports, RPT_ERROR, "Could not write image %s", name);
break;
}
@@ -1461,7 +1462,7 @@ static int image_reload_exec(bContext *C, wmOperator *UNUSED(op))
Image *ima= CTX_data_edit_image(C);
SpaceImage *sima= CTX_wm_space_image(C);
- if(!ima)
+ if (!ima)
return OPERATOR_CANCELLED;
/* XXX unpackImage frees image buffers */
@@ -1518,18 +1519,18 @@ static int image_new_exec(bContext *C, wmOperator *op)
if (!floatbuf && scene->r.color_mgt_flag & R_COLOR_MANAGEMENT)
linearrgb_to_srgb_v3_v3(color, color);
- if(!alpha)
+ if (!alpha)
color[3]= 1.0f;
ima = BKE_add_image_size(width, height, name, alpha ? 32 : 24, floatbuf, uvtestgrid, color);
- if(!ima)
+ if (!ima)
return OPERATOR_CANCELLED;
/* hook into UI */
uiIDContextProperty(C, &ptr, &prop);
- if(prop) {
+ if (prop) {
/* when creating new ID blocks, use is already 1, but RNA
* pointer se also increases user, so this compensates it */
ima->id.us--;
@@ -1538,7 +1539,7 @@ static int image_new_exec(bContext *C, wmOperator *op)
RNA_property_pointer_set(&ptr, prop, idptr);
RNA_property_update(C, &ptr, prop);
}
- else if(sima)
+ else if (sima)
ED_space_image_set(sima, scene, obedit, ima);
// XXX other users?
@@ -1589,7 +1590,7 @@ static int image_invert_poll(bContext *C)
Image *ima= CTX_data_edit_image(C);
ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
- if( ibuf != NULL )
+ if ( ibuf != NULL )
return 1;
return 0;
}
@@ -1607,32 +1608,32 @@ static int image_invert_exec(bContext *C, wmOperator *op)
int i;
- if( ibuf == NULL) // TODO: this should actually never happen, but does for render-results -> cleanup
+ if ( ibuf == NULL) // TODO: this should actually never happen, but does for render-results -> cleanup
return OPERATOR_CANCELLED;
/* TODO: make this into an IMB_invert_channels(ibuf,r,g,b,a) method!? */
if (ibuf->rect_float) {
float *fp = (float *) ibuf->rect_float;
- for( i = ibuf->x * ibuf->y; i > 0; i--, fp+=4 ) {
- if( r ) fp[0] = 1.0f - fp[0];
- if( g ) fp[1] = 1.0f - fp[1];
- if( b ) fp[2] = 1.0f - fp[2];
- if( a ) fp[3] = 1.0f - fp[3];
+ for ( i = ibuf->x * ibuf->y; i > 0; i--, fp+=4 ) {
+ if ( r ) fp[0] = 1.0f - fp[0];
+ if ( g ) fp[1] = 1.0f - fp[1];
+ if ( b ) fp[2] = 1.0f - fp[2];
+ if ( a ) fp[3] = 1.0f - fp[3];
}
- if(ibuf->rect) {
+ if (ibuf->rect) {
IMB_rect_from_float(ibuf);
}
}
- else if(ibuf->rect) {
+ else if (ibuf->rect) {
char *cp = (char *) ibuf->rect;
- for( i = ibuf->x * ibuf->y; i > 0; i--, cp+=4 ) {
- if( r ) cp[0] = 255 - cp[0];
- if( g ) cp[1] = 255 - cp[1];
- if( b ) cp[2] = 255 - cp[2];
- if( a ) cp[3] = 255 - cp[3];
+ for ( i = ibuf->x * ibuf->y; i > 0; i--, cp+=4 ) {
+ if ( r ) cp[0] = 255 - cp[0];
+ if ( g ) cp[1] = 255 - cp[1];
+ if ( b ) cp[2] = 255 - cp[2];
+ if ( a ) cp[3] = 255 - cp[3];
}
}
else {
@@ -1640,7 +1641,7 @@ static int image_invert_exec(bContext *C, wmOperator *op)
}
ibuf->userflags |= IB_BITMAPDIRTY;
- if(ibuf->mipmap[0])
+ if (ibuf->mipmap[0])
ibuf->userflags |= IB_MIPMAP_INVALID;
WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, ima);
@@ -1674,12 +1675,12 @@ static int image_pack_test(bContext *C, wmOperator *op)
Image *ima= CTX_data_edit_image(C);
int as_png= RNA_boolean_get(op->ptr, "as_png");
- if(!ima)
+ if (!ima)
return 0;
- if(!as_png && ima->packedfile)
+ if (!as_png && ima->packedfile)
return 0;
- if(ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
+ if (ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
BKE_report(op->reports, RPT_ERROR, "Packing movies or image sequences not supported");
return 0;
}
@@ -1694,15 +1695,15 @@ static int image_pack_exec(bContext *C, wmOperator *op)
ImBuf *ibuf= BKE_image_get_ibuf(ima, NULL);
int as_png= RNA_boolean_get(op->ptr, "as_png");
- if(!image_pack_test(C, op))
+ if (!image_pack_test(C, op))
return OPERATOR_CANCELLED;
- if(!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
+ if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
BKE_report(op->reports, RPT_ERROR, "Can't pack edited image from disk, only as internal PNG");
return OPERATOR_CANCELLED;
}
- if(as_png)
+ if (as_png)
BKE_image_memorypack(ima);
else
ima->packedfile= newPackedFile(op->reports, ima->name, ID_BLEND_PATH(bmain, &ima->id));
@@ -1720,10 +1721,10 @@ static int image_pack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(event)
uiLayout *layout;
int as_png= RNA_boolean_get(op->ptr, "as_png");
- if(!image_pack_test(C, op))
+ if (!image_pack_test(C, op))
return OPERATOR_CANCELLED;
- if(!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
+ if (!as_png && (ibuf && (ibuf->userflags & IB_BITMAPDIRTY))) {
pup= uiPupMenuBegin(C, "OK", ICON_QUESTION);
layout= uiPupMenuLayout(pup);
uiItemBooleanO(layout, "Can't pack edited image from disk. Pack as internal PNG?", ICON_NONE, op->idname, "as_png", 1);
@@ -1768,15 +1769,15 @@ static int image_unpack_exec(bContext *C, wmOperator *op)
if (!ima) ima = CTX_data_edit_image(C);
}
- if(!ima || !ima->packedfile)
+ if (!ima || !ima->packedfile)
return OPERATOR_CANCELLED;
- if(ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
+ if (ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
BKE_report(op->reports, RPT_ERROR, "Unpacking movies or image sequences not supported");
return OPERATOR_CANCELLED;
}
- if(G.fileflags & G_AUTOPACK)
+ if (G.fileflags & G_AUTOPACK)
BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save");
/* XXX unpackImage frees image buffers */
@@ -1793,18 +1794,18 @@ static int image_unpack_invoke(bContext *C, wmOperator *op, wmEvent *UNUSED(even
{
Image *ima= CTX_data_edit_image(C);
- if(RNA_struct_property_is_set(op->ptr, "id"))
+ if (RNA_struct_property_is_set(op->ptr, "id"))
return image_unpack_exec(C, op);
- if(!ima || !ima->packedfile)
+ if (!ima || !ima->packedfile)
return OPERATOR_CANCELLED;
- if(ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
+ if (ima->source==IMA_SRC_SEQUENCE || ima->source==IMA_SRC_MOVIE) {
BKE_report(op->reports, RPT_ERROR, "Unpacking movies or image sequences not supported");
return OPERATOR_CANCELLED;
}
- if(G.fileflags & G_AUTOPACK)
+ if (G.fileflags & G_AUTOPACK)
BKE_report(op->reports, RPT_WARNING, "AutoPack is enabled, so image will be packed again on file save");
unpack_menu(C, "IMAGE_OT_unpack", ima->id.name+2, ima->name, "textures", ima->packedfile);
@@ -1855,7 +1856,7 @@ typedef struct ImageSampleInfo {
static void image_sample_draw(const bContext *UNUSED(C), ARegion *ar, void *arg_info)
{
ImageSampleInfo *info= arg_info;
- if(info->draw) {
+ if (info->draw) {
/* no color management needed for images (color_manage=0) */
ED_image_draw_info(ar, 0, info->channels, info->x, info->y, info->colp, info->colfp, info->zp, info->zfp);
}
@@ -1870,14 +1871,14 @@ static void image_sample_apply(bContext *C, wmOperator *op, wmEvent *event)
ImageSampleInfo *info= op->customdata;
float fx, fy;
- if(ibuf == NULL) {
+ if (ibuf == NULL) {
ED_space_image_release_buffer(sima, lock);
return;
}
UI_view2d_region_to_view(&ar->v2d, event->mval[0], event->mval[1], &fx, &fy);
- if(fx>=0.0f && fy>=0.0f && fx<1.0f && fy<1.0f) {
+ if (fx>=0.0f && fy>=0.0f && fx<1.0f && fy<1.0f) {
float *fp;
unsigned char *cp;
int x= (int)(fx*ibuf->x), y= (int)(fy*ibuf->y);
@@ -1895,7 +1896,7 @@ static void image_sample_apply(bContext *C, wmOperator *op, wmEvent *event)
info->zp= NULL;
info->zfp= NULL;
- if(ibuf->rect) {
+ if (ibuf->rect) {
cp= (unsigned char *)(ibuf->rect + y*ibuf->x + x);
info->col[0]= cp[0];
@@ -1910,7 +1911,7 @@ static void image_sample_apply(bContext *C, wmOperator *op, wmEvent *event)
info->colf[3]= (float)cp[3]/255.0f;
info->colfp= info->colf;
}
- if(ibuf->rect_float) {
+ if (ibuf->rect_float) {
fp= (ibuf->rect_float + (ibuf->channels)*(y*ibuf->x + x));
info->colf[0]= fp[0];
@@ -1920,28 +1921,28 @@ static void image_sample_apply(bContext *C, wmOperator *op, wmEvent *event)
info->colfp= info->colf;
}
- if(ibuf->zbuf) {
+ if (ibuf->zbuf) {
info->z= ibuf->zbuf[y*ibuf->x + x];
info->zp= &info->z;
}
- if(ibuf->zbuf_float) {
+ if (ibuf->zbuf_float) {
info->zf= ibuf->zbuf_float[y*ibuf->x + x];
info->zfp= &info->zf;
}
- if(sima->cumap && ibuf->channels==4) {
+ if (sima->cumap && ibuf->channels==4) {
/* we reuse this callback for set curves point operators */
- if(RNA_struct_find_property(op->ptr, "point")) {
+ if (RNA_struct_find_property(op->ptr, "point")) {
int point= RNA_enum_get(op->ptr, "point");
- if(point == 1) {
+ if (point == 1) {
curvemapping_set_black_white(sima->cumap, NULL, info->colfp);
- if(ibuf->rect_float)
+ if (ibuf->rect_float)
curvemapping_do_ibuf(sima->cumap, ibuf);
}
- else if(point == 0) {
+ else if (point == 0) {
curvemapping_set_black_white(sima->cumap, info->colfp, NULL);
- if(ibuf->rect_float)
+ if (ibuf->rect_float)
curvemapping_do_ibuf(sima->cumap, ibuf);
}
}
@@ -1953,8 +1954,8 @@ static void image_sample_apply(bContext *C, wmOperator *op, wmEvent *event)
ScrArea *sa, *cur= curarea;
node_curvemap_sample(fp); /* sends global to node editor */
- for(sa= G.curscreen->areabase.first; sa; sa= sa->next) {
- if(sa->spacetype==SPACE_NODE) {
+ for (sa= G.curscreen->areabase.first; sa; sa= sa->next) {
+ if (sa->spacetype==SPACE_NODE) {
areawinset(sa->win);
scrarea_do_windraw(sa);
}
@@ -1986,7 +1987,7 @@ static int image_sample_invoke(bContext *C, wmOperator *op, wmEvent *event)
ARegion *ar= CTX_wm_region(C);
ImageSampleInfo *info;
- if(!ED_space_image_has_buffer(sima))
+ if (!ED_space_image_has_buffer(sima))
return OPERATOR_CANCELLED;
info= MEM_callocN(sizeof(ImageSampleInfo), "ImageSampleInfo");
@@ -2089,7 +2090,8 @@ static int image_sample_line_exec(bContext *C, wmOperator *op)
if (x<0 || y<0 || x>=ibuf->x || y>=ibuf->y) {
hist->data_luma[i] = hist->data_r[i] = hist->data_g[i]= hist->data_b[i] = 0.0f;
- } else {
+ }
+ else {
if (ibuf->rect_float) {
fp= (ibuf->rect_float + (ibuf->channels)*(y*ibuf->x + x));
@@ -2124,7 +2126,7 @@ static int image_sample_line_invoke(bContext *C, wmOperator *op, wmEvent *event)
{
SpaceImage *sima= CTX_wm_space_image(C);
- if(!ED_space_image_has_buffer(sima))
+ if (!ED_space_image_has_buffer(sima))
return OPERATOR_CANCELLED;
return WM_gesture_straightline_invoke(C, op, event);
@@ -2203,7 +2205,7 @@ static int image_record_composite_apply(bContext *C, wmOperator *op)
ibuf= BKE_image_get_ibuf(sima->image, &sima->iuser);
/* save memory in flipbooks */
- if(ibuf)
+ if (ibuf)
imb_freerectfloatImBuf(ibuf);
scene->r.cfra++;
@@ -2217,9 +2219,9 @@ static int image_record_composite_init(bContext *C, wmOperator *op)
Scene *scene= CTX_data_scene(C);
RecordCompositeData *rcd;
- if(sima->iuser.frames < 2)
+ if (sima->iuser.frames < 2)
return 0;
- if(scene->nodetree == NULL)
+ if (scene->nodetree == NULL)
return 0;
op->customdata= rcd= MEM_callocN(sizeof(RecordCompositeData), "ImageRecordCompositeData");
@@ -2242,7 +2244,7 @@ static void image_record_composite_exit(bContext *C, wmOperator *op)
WM_cursor_restore(CTX_wm_window(C));
- if(rcd->timer)
+ if (rcd->timer)
WM_event_remove_timer(CTX_wm_manager(C), CTX_wm_window(C), rcd->timer);
WM_event_add_notifier(C, NC_IMAGE|NA_EDITED, sima->image);
@@ -2255,7 +2257,7 @@ static void image_record_composite_exit(bContext *C, wmOperator *op)
static int image_record_composite_exec(bContext *C, wmOperator *op)
{
- if(!image_record_composite_init(C, op))
+ if (!image_record_composite_init(C, op))
return OPERATOR_CANCELLED;
while(image_record_composite_apply(C, op))
@@ -2270,14 +2272,14 @@ static int image_record_composite_invoke(bContext *C, wmOperator *op, wmEvent *U
{
RecordCompositeData *rcd;
- if(!image_record_composite_init(C, op))
+ if (!image_record_composite_init(C, op))
return OPERATOR_CANCELLED;
rcd= op->customdata;
rcd->timer= WM_event_add_timer(CTX_wm_manager(C), CTX_wm_window(C), TIMER, 0.0f);
WM_event_add_modal_handler(C, op);
- if(!image_record_composite_apply(C, op))
+ if (!image_record_composite_apply(C, op))
return OPERATOR_FINISHED;
return OPERATOR_RUNNING_MODAL;
@@ -2289,8 +2291,8 @@ static int image_record_composite_modal(bContext *C, wmOperator *op, wmEvent *ev
switch(event->type) {
case TIMER:
- if(rcd->timer == event->customdata) {
- if(!image_record_composite_apply(C, op)) {
+ if (rcd->timer == event->customdata) {
+ if (!image_record_composite_apply(C, op)) {
image_record_composite_exit(C, op);
return OPERATOR_FINISHED;
}
@@ -2339,27 +2341,27 @@ static int image_cycle_render_slot_exec(bContext *C, wmOperator *op)
int a, slot, cur= ima->render_slot;
const short use_reverse= RNA_boolean_get(op->ptr, "reverse");
- for(a=1; a<IMA_MAX_RENDER_SLOT; a++) {
+ for (a=1; a<IMA_MAX_RENDER_SLOT; a++) {
slot= (cur + (use_reverse ? -a:a))%IMA_MAX_RENDER_SLOT;
- if(slot<0) slot+=IMA_MAX_RENDER_SLOT;
+ if (slot<0) slot+=IMA_MAX_RENDER_SLOT;
- if(ima->renders[slot] || slot == ima->last_render_slot) {
+ if (ima->renders[slot] || slot == ima->last_render_slot) {
ima->render_slot= slot;
break;
}
- else if((slot - 1) == ima->last_render_slot && slot < IMA_MAX_RENDER_SLOT) {
+ else if ((slot - 1) == ima->last_render_slot && slot < IMA_MAX_RENDER_SLOT) {
ima->render_slot= slot;
break;
}
}
- if(a == IMA_MAX_RENDER_SLOT)
+ if (a == IMA_MAX_RENDER_SLOT)
ima->render_slot= ((cur == 1)? 0: 1);
WM_event_add_notifier(C, NC_IMAGE|ND_DRAW, NULL);
/* no undo push for browsing existing */
- if(ima->renders[ima->render_slot] || ima->render_slot==ima->last_render_slot)
+ if (ima->renders[ima->render_slot] || ima->render_slot==ima->last_render_slot)
return OPERATOR_CANCELLED;
return OPERATOR_FINISHED;
@@ -2394,42 +2396,42 @@ void ED_image_update_frame(const Main *mainp, int cfra)
Tex *tex;
/* texture users */
- for(tex= mainp->tex.first; tex; tex= tex->id.next) {
- if(tex->type==TEX_IMAGE && tex->ima) {
- if(ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
- if(tex->iuser.flag & IMA_ANIM_ALWAYS)
+ for (tex= mainp->tex.first; tex; tex= tex->id.next) {
+ if (tex->type==TEX_IMAGE && tex->ima) {
+ if (ELEM(tex->ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE)) {
+ if (tex->iuser.flag & IMA_ANIM_ALWAYS)
BKE_image_user_calc_frame(&tex->iuser, cfra, 0);
}
}
}
/* image window, compo node users */
- for(wm=mainp->wm.first; wm; wm= wm->id.next) { /* only 1 wm */
- for(win= wm->windows.first; win; win= win->next) {
+ for (wm=mainp->wm.first; wm; wm= wm->id.next) { /* only 1 wm */
+ for (win= wm->windows.first; win; win= win->next) {
ScrArea *sa;
- for(sa= win->screen->areabase.first; sa; sa= sa->next) {
- if(sa->spacetype==SPACE_VIEW3D) {
+ for (sa= win->screen->areabase.first; sa; sa= sa->next) {
+ if (sa->spacetype==SPACE_VIEW3D) {
View3D *v3d= sa->spacedata.first;
BGpic *bgpic;
- for(bgpic= v3d->bgpicbase.first; bgpic; bgpic= bgpic->next)
- if(bgpic->iuser.flag & IMA_ANIM_ALWAYS)
+ for (bgpic= v3d->bgpicbase.first; bgpic; bgpic= bgpic->next)
+ if (bgpic->iuser.flag & IMA_ANIM_ALWAYS)
BKE_image_user_calc_frame(&bgpic->iuser, cfra, 0);
}
- else if(sa->spacetype==SPACE_IMAGE) {
+ else if (sa->spacetype==SPACE_IMAGE) {
SpaceImage *sima= sa->spacedata.first;
- if(sima->iuser.flag & IMA_ANIM_ALWAYS)
+ if (sima->iuser.flag & IMA_ANIM_ALWAYS)
BKE_image_user_calc_frame(&sima->iuser, cfra, 0);
}
- else if(sa->spacetype==SPACE_NODE) {
+ else if (sa->spacetype==SPACE_NODE) {
SpaceNode *snode= sa->spacedata.first;
- if((snode->treetype==NTREE_COMPOSIT) && (snode->nodetree)) {
+ if ((snode->treetype==NTREE_COMPOSIT) && (snode->nodetree)) {
bNode *node;
- for(node= snode->nodetree->nodes.first; node; node= node->next) {
- if(node->id && node->type==CMP_NODE_IMAGE) {
+ for (node= snode->nodetree->nodes.first; node; node= node->next) {
+ if (node->id && node->type==CMP_NODE_IMAGE) {
Image *ima= (Image *)node->id;
ImageUser *iuser= node->storage;
- if(ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE))
- if(iuser->flag & IMA_ANIM_ALWAYS)
+ if (ELEM(ima->source, IMA_SRC_MOVIE, IMA_SRC_SEQUENCE))
+ if (iuser->flag & IMA_ANIM_ALWAYS)
BKE_image_user_calc_frame(iuser, cfra, 0);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 01:54:06 +0300