Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-05-21 23:07:18 +10:00
commit 2fe615ab9f
1 changed files with 5 additions and 1 deletions

View File

@ -1565,7 +1565,11 @@ static void rna_def_texture(BlenderRNA *brna)
prop = RNA_def_property(srna, "use_color_ramp", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "flag", TEX_COLORBAND);
RNA_def_property_boolean_funcs(prop, NULL, "rna_Texture_use_color_ramp_set");
RNA_def_property_ui_text(prop, "Use Color Ramp", "Toggle color ramp operations");
RNA_def_property_ui_text(prop,
"Use Color Ramp",
"Map the texture intensity to the color ramp. "
"Note that the alpha value is used for image textures, "
"enable \"Calculate Alpha\" for images without an alpha channel");
RNA_def_property_update(prop, 0, "rna_Texture_update");
prop = RNA_def_property(srna, "color_ramp", PROP_POINTER, PROP_NEVER_NULL);