diff options
author | Thomas Dinges <blender@dingto.org> | 2009-05-15 20:24:08 +0400 |
---|---|---|
committer | Thomas Dinges <blender@dingto.org> | 2009-05-15 20:24:08 +0400 |
commit | 120ef020279b986795804f9df17005c8e498f1f2 (patch) | |
tree | b7542cb95c6a36761b9257e929dd58f867d22edc /source | |
parent | b4d46e5dedfa88951558a4f941d987a171594a0a (diff) |
2.5 Buttons:
* Cleanup of scene, lamp and camera panels.
* Small RNA lamp changes.
Diffstat (limited to 'source')
-rw-r--r-- | source/blender/makesrna/intern/rna_lamp.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/source/blender/makesrna/intern/rna_lamp.c b/source/blender/makesrna/intern/rna_lamp.c index 333c356acbc..b3baac88702 100644 --- a/source/blender/makesrna/intern/rna_lamp.c +++ b/source/blender/makesrna/intern/rna_lamp.c @@ -372,10 +372,15 @@ static void rna_def_lamp_shadow(StructRNA *srna, int spot, int area) {0, NULL, NULL, NULL}}; static EnumPropertyItem prop_ray_sampling_method_items[] = { - {LA_SAMP_CONSTANT, "CONSTANT_JITTERED", "Constant Jittered", ""}, {LA_SAMP_HALTON, "ADAPTIVE_QMC", "Adaptive QMC", ""}, {LA_SAMP_HAMMERSLEY, "CONSTANT_QMC", "Constant QMC", ""}, {0, NULL, NULL, NULL}}; + + static EnumPropertyItem prop_spot_ray_sampling_method_items[] = { + {LA_SAMP_HALTON, "ADAPTIVE_QMC", "Adaptive QMC", ""}, + {LA_SAMP_HAMMERSLEY, "CONSTANT_QMC", "Constant QMC", ""}, + {LA_SAMP_CONSTANT, "CONSTANT_JITTERED", "Constant Jittered", ""}, + {0, NULL, NULL, NULL}}; prop= RNA_def_property(srna, "shadow_method", PROP_ENUM, PROP_NONE); @@ -397,7 +402,7 @@ static void rna_def_lamp_shadow(StructRNA *srna, int spot, int area) prop= RNA_def_property(srna, "shadow_ray_sampling_method", PROP_ENUM, PROP_NONE); RNA_def_property_enum_sdna(prop, NULL, "ray_samp_method"); - RNA_def_property_enum_items(prop, prop_ray_sampling_method_items); + RNA_def_property_enum_items(prop, (area)? prop_spot_ray_sampling_method_items: prop_ray_sampling_method_items); RNA_def_property_ui_text(prop, "Shadow Ray Sampling Method", "Method for generating shadow samples: Adaptive QMC is fastest, Constant QMC is less noisy but slower."); RNA_def_property_update(prop, NC_LAMP|ND_LIGHTING, NULL); @@ -508,8 +513,8 @@ static void rna_def_spot_lamp(BlenderRNA *brna) static EnumPropertyItem prop_shadbuftype_items[] = { {LA_SHADBUF_REGULAR , "REGULAR", "Classical", "Classic shadow buffer."}, - {LA_SHADBUF_IRREGULAR, "IRREGULAR", "Irregular", "Irregular buffer produces sharp shadow always, but it doesn't show up for raytracing."}, {LA_SHADBUF_HALFWAY, "HALFWAY", "Classic-Halfway", "Regular buffer, averaging the closest and 2nd closest Z value to reducing bias artifaces."}, + {LA_SHADBUF_IRREGULAR, "IRREGULAR", "Irregular", "Irregular buffer produces sharp shadow always, but it doesn't show up for raytracing."}, {0, NULL, NULL, NULL}}; static EnumPropertyItem prop_shadbuffiltertype_items[] = { |