Differential D10310 Diff 33573 source/blender/editors/space_image/image_ops.c

Changeset View

Standalone View

source/blender/editors/space_image/image_ops.c

Show First 20 Lines • Show All 2,657 Lines • ▼ Show 20 Lines	void IMAGE_OT_new(wmOperatorType *ot)
RNA_def_property_flag(prop, PROP_SKIP_SAVE);		RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}		}

#undef IMA_DEF_NAME		#undef IMA_DEF_NAME

/** \} */		/** \} */

/* -------------------------------------------------------------------- */		/* -------------------------------------------------------------------- */
		/** \name Flip Operator
		* \{ */

		static int image_flip_exec(bContext C, wmOperator op)
		{
		Image *ima = image_from_context(C);
		ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL);
		SpaceImage *sima = CTX_wm_space_image(C);
		const bool is_paint = ((sima != NULL) && (sima->mode == SI_MODE_PAINT));

		if (ibuf == NULL) {
		/* TODO: this should actually never happen, but does for render-results -> cleanup. */
		JacquesLuckeUnsubmitted Done Inline Actions Comments should end with a `.`, same below. JacquesLucke: Comments should end with a `.`, same below.
		return OPERATOR_CANCELLED;
		}

		const bool flip_horizontal = RNA_boolean_get(op->ptr, "use_flip_horizontal");
		const bool flip_vertical = RNA_boolean_get(op->ptr, "use_flip_vertical");

		if (!flip_horizontal && !flip_vertical) {
		BKE_image_release_ibuf(ima, ibuf, NULL);
		JacquesLuckeUnsubmitted Done Inline Actions I think you might have to be careful with returning early because of `BKE_image_release_ibuf`. JacquesLucke: I think you might have to be careful with returning early because of `BKE_image_release_ibuf`.
		return OPERATOR_FINISHED;
		}

		ED_image_undo_push_begin_with_image(op->type->name, ima, ibuf, &sima->iuser);

		if (is_paint) {
		ED_imapaint_clear_partial_redraw();
		}

		const int size_x = ibuf->x;
		const int size_y = ibuf->y;

		if (ibuf->rect_float) {
		JacquesLuckeUnsubmitted Not Done Inline Actions What does `fp` and `cp` stand for? I wouldn't mind a slighly more descriptive name. JacquesLucke: What does `fp` and `cp` stand for? I wouldn't mind a slighly more descriptive name.
		pablodp606AuthorUnsubmitted Done Inline Actions This naming is used in other places in this file, I guess it refers to char_pixels and float_pixels. I can use those names for this operator if you think that is better. pablodp606: This naming is used in other places in this file, I guess it refers to char_pixels and…
		JacquesLuckeUnsubmitted Done Inline Actions Hm yes, I think `char_pixels` and `float_pixels` is better here. JacquesLucke: Hm yes, I think `char_pixels` and `float_pixels` is better here.
		float float_pixels = (float )ibuf->rect_float;

		float *orig_float_pixels = MEM_dupallocN(float_pixels);
		for (int x = 0; x < size_x; x++) {
		for (int y = 0; y < size_y; y++) {
		JacquesLuckeUnsubmitted Done Inline Actions Haven't tried it, but it seems like this should be `size_x - x - 1`. JacquesLucke: Haven't tried it, but it seems like this should be `size_x - x - 1`.
		const int source_pixel_x = flip_horizontal ? size_x - x - 1 : x;
		const int source_pixel_y = flip_vertical ? size_y - y - 1 : y;

		float source_pixel = &orig_float_pixels[4 (source_pixel_x + source_pixel_y * size_x)];
		float target_pixel = &float_pixels[4 (x + y * size_x)];

		copy_v4_v4(target_pixel, source_pixel);
		}
		}
		MEM_freeN(orig_float_pixels);

		if (ibuf->rect) {
		IMB_rect_from_float(ibuf);
		}
		}
		else if (ibuf->rect) {
		char char_pixels = (char )ibuf->rect;
		char *orig_char_pixels = MEM_dupallocN(char_pixels);
		for (int x = 0; x < size_x; x++) {
		for (int y = 0; y < size_y; y++) {
		const int source_pixel_x = flip_horizontal ? size_x - x - 1 : x;
		const int source_pixel_y = flip_vertical ? size_y - y - 1 : y;

		char source_pixel = &orig_char_pixels[4 (source_pixel_x + source_pixel_y * size_x)];
		char target_pixel = &char_pixels[4 (x + y * size_x)];

		copy_v4_v4_char(target_pixel, source_pixel);
		}
		}
		MEM_freeN(orig_char_pixels);
		}
		else {
		BKE_image_release_ibuf(ima, ibuf, NULL);
		return OPERATOR_CANCELLED;
		}

		ibuf->userflags \|= IB_DISPLAY_BUFFER_INVALID;
		BKE_image_mark_dirty(ima, ibuf);

		if (ibuf->mipmap[0]) {
		ibuf->userflags \|= IB_MIPMAP_INVALID;
		}

		ED_image_undo_push_end();

		/* force GPU reupload, all image is invalid. */
		BKE_image_free_gputextures(ima);

		WM_event_add_notifier(C, NC_IMAGE \| NA_EDITED, ima);

		BKE_image_release_ibuf(ima, ibuf, NULL);

		return OPERATOR_FINISHED;
		}

		void IMAGE_OT_flip(wmOperatorType *ot)
		{
		/* identifiers */
		ot->name = "Flip Image";
		ot->idname = "IMAGE_OT_flip";
		ot->description = "Flip the image";

		/* api callbacks */
		ot->exec = image_flip_exec;
		ot->poll = image_from_context_has_data_poll_no_image_user;

		/* properties */
		PropertyRNA *prop;
		prop = RNA_def_boolean(
		ot->srna, "use_flip_horizontal", false, "Horizontal", "Flip the image horizontally");
		RNA_def_property_flag(prop, PROP_SKIP_SAVE);
		prop = RNA_def_boolean(
		ot->srna, "use_flip_vertical", false, "Vertical", "Flip the image vertically");
		RNA_def_property_flag(prop, PROP_SKIP_SAVE);

		/* flags */
		ot->flag = OPTYPE_REGISTER;
		}

		/** \} */

		/* -------------------------------------------------------------------- */
/** \name Invert Operators		/** \name Invert Operators
* \{ */		* \{ */

static int image_invert_exec(bContext C, wmOperator op)		static int image_invert_exec(bContext C, wmOperator op)
{		{
Image *ima = image_from_context(C);		Image *ima = image_from_context(C);
ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL);		ImBuf *ibuf = BKE_image_acquire_ibuf(ima, NULL, NULL);
SpaceImage *sima = CTX_wm_space_image(C);		SpaceImage *sima = CTX_wm_space_image(C);
▲ Show 20 Lines • Show All 1,302 Lines • Show Last 20 Lines