[Bf-blender-cvs] [0527183] master: Fix copy-paste of colors to generated color not being correct. '

[Antony Riakiotakis]

Commit: 05271830901401dd6a395f730990a6ac1ca6a6d6
Author: Antony Riakiotakis
Date:   Tue Jan 6 15:48:02 2015 +0100
Branches: master
https://developer.blender.org/rB05271830901401dd6a395f730990a6ac1ca6a6d6

Fix copy-paste of colors to generated color not being correct. '

Change generated color property to gamma space to match the add new
image operator.

===================================================================

M	source/blender/makesrna/intern/rna_image.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_image.c b/source/blender/makesrna/intern/rna_image.c
index 397e03a..b1935b3 100644
--- a/source/blender/makesrna/intern/rna_image.c
+++ b/source/blender/makesrna/intern/rna_image.c
@@ -675,7 +675,7 @@ static void rna_def_image(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_IMAGE | ND_DISPLAY, "rna_Image_generated_update");
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
 
-	prop = RNA_def_property(srna, "generated_color", PROP_FLOAT, PROP_COLOR);
+	prop = RNA_def_property(srna, "generated_color", PROP_FLOAT, PROP_COLOR_GAMMA);
 	RNA_def_property_float_sdna(prop, NULL, "gen_color");
 	RNA_def_property_array(prop, 4);
 	RNA_def_property_ui_text(prop, "Color", "Fill color for the generated image");