diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-03-19 13:26:15 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-03-19 13:26:15 +0300 |
| commit | ff1656175ac6a408bef1b77abd91406cdf895c93 (patch) | |
| tree | bda36efec5bcced971d99687cb223e0ac050f3b4 /source/blender/makesrna/intern/rna_lamp.c | |
| parent | e9005b985ef283d952aaaa7486d42ad6a48fb117 (diff) | |
Fix #26543: lamp sky settings were missing soft/linear light blend types,
made enum items shared with material ramp and mix node.
Diffstat (limited to 'source/blender/makesrna/intern/rna_lamp.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 225a72bb073..5f274a09f5d 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -30,6 +30,7 @@ #include <stdlib.h> #include "RNA_define.h" +#include "RNA_enum_types.h" #include "rna_internal.h" @@ -217,25 +218,6 @@ static void rna_def_lamp_sky_settings(BlenderRNA *brna) {2, "CIE", 0, "CIE", ""}, {0, NULL, 0, NULL, NULL}}; - static EnumPropertyItem prop_blendmode_items[] = { - {0, "MIX", 0, "Mix", ""}, - {1, "ADD", 0, "Add", ""}, - {2, "MULTIPLY", 0, "Multiply", ""}, - {3, "SUBTRACT", 0, "Subtract", ""}, - {4, "SCREEN", 0, "Screen", ""}, - {5, "DIVIDE", 0, "Divide", ""}, - {6, "DIFFERENCE", 0, "Difference", ""}, - {7, "DARKEN", 0, "Darken", ""}, - {8, "LIGHTEN", 0, "Lighten", ""}, - {9, "OVERLAY", 0, "Overlay", ""}, - {10, "DODGE", 0, "Dodge", ""}, - {11, "BURN", 0, "Burn", ""}, - {12, "HUE", 0, "Hue", ""}, - {13, "SATURATION", 0, "Saturation", ""}, - {14, "VALUE", 0, "Value", ""}, - {15, "COLOR", 0, "Color", ""}, - {0, NULL, 0, NULL, NULL}}; - srna= RNA_def_struct(brna, "LampSkySettings", NULL); RNA_def_struct_sdna(srna, "Lamp"); RNA_def_struct_nested(brna, srna, "SunLamp"); @@ -249,7 +231,7 @@ static void rna_def_lamp_sky_settings(BlenderRNA *brna) prop= RNA_def_property(srna, "sky_blend_type", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "skyblendtype"); - RNA_def_property_enum_items(prop, prop_blendmode_items); + RNA_def_property_enum_items(prop, ramp_blend_items); RNA_def_property_ui_text(prop, "Sky Blend Mode", "Blend mode for combining sun sky with world sky"); RNA_def_property_update(prop, 0, "rna_Lamp_sky_update"); |