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
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-26 16:04:44 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-06-26 16:06:49 +0300
commit6d22633a96a4ef18051ba6a937ed9c1d1e5d967c (patch)
tree47932a6db0f16f3bf6c59420b251b9c50c3ac82e /source/blender/editors
parent4f386999ea92ad0f22bffa151581cf5c615c660b (diff)
Fix T66137: added normal map for painting has wrong color space until refresh
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/sculpt_paint/paint_image_proj.c17
-rw-r--r--source/blender/editors/space_image/image_ops.c2
2 files changed, 11 insertions, 8 deletions
diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c
index 2cc8adf6f36..79731a6752d 100644
--- a/source/blender/editors/sculpt_paint/paint_image_proj.c
+++ b/source/blender/editors/sculpt_paint/paint_image_proj.c
@@ -6435,13 +6435,16 @@ static Image *proj_paint_image_create(wmOperator *op, Main *bmain, bool is_data)
alpha = RNA_boolean_get(op->ptr, "alpha");
RNA_string_get(op->ptr, "name", imagename);
}
- ima = BKE_image_add_generated(
- bmain, width, height, imagename, alpha ? 32 : 24, use_float, gen_type, color, false);
-
- if (is_data) {
- STRNCPY(ima->colorspace_settings.name,
- IMB_colormanagement_role_colorspace_name_get(COLOR_ROLE_DATA));
- }
+ ima = BKE_image_add_generated(bmain,
+ width,
+ height,
+ imagename,
+ alpha ? 32 : 24,
+ use_float,
+ gen_type,
+ color,
+ false,
+ is_data);
return ima;
}
diff --git a/source/blender/editors/space_image/image_ops.c b/source/blender/editors/space_image/image_ops.c
index 9eda7ffdc34..96eaa89d175 100644
--- a/source/blender/editors/space_image/image_ops.c
+++ b/source/blender/editors/space_image/image_ops.c
@@ -2499,7 +2499,7 @@ static int image_new_exec(bContext *C, wmOperator *op)
}
ima = BKE_image_add_generated(
- bmain, width, height, name, alpha ? 32 : 24, floatbuf, gen_type, color, stereo3d);
+ bmain, width, height, name, alpha ? 32 : 24, floatbuf, gen_type, color, stereo3d, false);
if (!ima) {
image_new_free(op);