Revision: 18352
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=18352
Author: campbellbarton
Date: 2009-01-06 00:53:37 +0100 (Tue, 06 Jan 2009)
Log Message:
-----------
since material ray/mirror/halo properties are now in their own RNA structs
remove their prefix.
material.?\239?\187?\191raytrace_transparency.ray_transparency_depth ->
material.?\239?\187?\191raytrace_transparency.depth
Also renamed...
ray_mirror to reflect,
mode_ray_mirror, mode_ray_transparency, mode_halo to "enabled" matching the SSS
struct.
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
Modified:
branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
===================================================================
--- branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
2009-01-05 23:53:04 UTC (rev 18351)
+++ branches/blender2.5/blender/source/blender/makesrna/intern/rna_material.c
2009-01-05 23:53:37 UTC (rev 18352)
@@ -164,65 +164,66 @@
RNA_def_property_pointer_funcs(prop, "rna_Material_self_get", NULL,
NULL);
RNA_def_property_ui_text(prop, "Raytrace Mirror", "");
- prop= RNA_def_property(srna, "mode_ray_mirror", PROP_BOOLEAN,
PROP_NONE);
+ prop= RNA_def_property(srna, "enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAYMIRROR); /* use
bitflags */
RNA_def_property_ui_text(prop, "Ray Mirror Mode", "Toggle raytrace
mirror.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror", PROP_FLOAT, PROP_NONE);
+ prop= RNA_def_property(srna, "reflect", PROP_FLOAT, PROP_NONE);
+ RNA_def_property_float_sdna(prop, NULL, "ray_mirror");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Mirror", "Sets the amount mirror
reflection for raytrace.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_fresnel", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "fresnel", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "fresnel_mir");
RNA_def_property_range(prop, 0.0f, 5.0f);
RNA_def_property_ui_text(prop, "Ray Mirror Fresnel", "Power of Fresnel
for mirror reflection.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_fresnel_fac", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "fresnel_fac", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "fresnel_mir_i");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Mirror Fresnel Factor", "Blending
factor for Fresnel.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_gloss", PROP_FLOAT, PROP_NONE);
+ prop= RNA_def_property(srna, "gloss", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "gloss_mir");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Mirror Gloss", "The shininess of
the reflection. Values < 1.0 give diffuse, blurry reflections.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_gloss_aniso", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "gloss_aniso", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "aniso_gloss_mir");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Mirror Gloss Aniso", "The shape of
the reflection, from 0.0 (circular) to 1.0 (fully stretched along the
tangent.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_gloss_samples", PROP_INT,
PROP_NONE);
+ prop= RNA_def_property(srna, "gloss_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "samp_gloss_mir");
RNA_def_property_range(prop, 0, 1024);
RNA_def_property_ui_text(prop, "Ray Mirror Gloss Samples", "Number of
cone samples averaged for blurry reflections.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_adapt_thresh", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "adapt_thresh", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "adapt_thresh_mir");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Mirror Gloss Threshold", "Threshold
for adaptive sampling. If a sample contributes less than this amount (as a
percentage), sampling is stopped.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_depth", PROP_INT, PROP_NONE);
+ prop= RNA_def_property(srna, "depth", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "ray_depth");
RNA_def_property_range(prop, 0, 10);
RNA_def_property_ui_text(prop, "Ray Mirror Depth", "Maximum allowed
number of light inter-reflections.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_distance", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "distance", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "dist_mir");
RNA_def_property_range(prop, 0.0f, 10000.0f);
RNA_def_property_ui_text(prop, "Ray Mirror Max Dist", "Maximum distance
of reflected rays. Reflections further than this range fade to sky color or
material color.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_mirror_fadeto", PROP_ENUM, PROP_NONE);
+ prop= RNA_def_property(srna, "fade_to", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "fadeto_mir");
RNA_def_property_enum_items(prop, prop_fadeto_mir_items);
RNA_def_property_ui_text(prop, "Ray Mirror End Fade-out", "The color
that rays with no intersection within the Max Distance take. Material color can
be best for indoor scenes, sky color for outdoor.");
@@ -243,72 +244,72 @@
RNA_def_property_pointer_funcs(prop, "rna_Material_self_get", NULL,
NULL);
RNA_def_property_ui_text(prop, "Raytrace Transparency", "");
- prop= RNA_def_property(srna, "mode_ray_transparency", PROP_BOOLEAN,
PROP_NONE);
+ prop= RNA_def_property(srna, "enable", PROP_BOOLEAN, PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "mode", MA_RAYTRANSP); /* use
bitflags */
RNA_def_property_ui_text(prop, "Ray Transparency Mode", "Enables
raytracing for transparent refraction rendering.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_ior", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "ior", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "ang");
RNA_def_property_range(prop, 1.0f, 3.0f);
RNA_def_property_ui_text(prop, "Ray Transparency IOR", "Sets angular
index of refraction for raytraced refraction.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_fresnel", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "fresnel", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "fresnel_tra");
RNA_def_property_range(prop, 0.0f, 5.0f);
RNA_def_property_ui_text(prop, "Ray Transparency Fresnel", "Power of
Fresnel for transparency (Ray or ZTransp).");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_fresnel_fac",
PROP_FLOAT, PROP_NONE);
+ prop= RNA_def_property(srna, "fresnel_fac", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "fresnel_tra_i");
RNA_def_property_range(prop, 1.0f, 5.0f);
RNA_def_property_ui_text(prop, "Ray Transparency Fresnel Factor",
"Blending factor for Fresnel.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_gloss", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "gloss", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "gloss_tra");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Transparency Gloss", "The clarity
of the refraction. Values < 1.0 give diffuse, blurry refractions.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_gloss_samples",
PROP_INT, PROP_NONE);
+ prop= RNA_def_property(srna, "gloss_samples", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "samp_gloss_tra");
RNA_def_property_range(prop, 0, 1024);
RNA_def_property_ui_text(prop, "Ray Transparency Gloss Samples",
"Number of cone samples averaged for blurry refractions.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_adapt_thresh",
PROP_FLOAT, PROP_NONE);
+ prop= RNA_def_property(srna, "adapt_thresh", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "adapt_thresh_tra");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Transparency Gloss Threshold",
"Threshold for adaptive sampling. If a sample contributes less than this amount
(as a percentage), sampling is stopped.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_depth", PROP_INT,
PROP_NONE);
+ prop= RNA_def_property(srna, "depth", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "ray_depth_tra");
RNA_def_property_range(prop, 0, 10);
RNA_def_property_ui_text(prop, "Ray Transparency Depth", "Maximum
allowed number of light inter-refractions.");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_filter", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "filter", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "filter");
RNA_def_property_range(prop, 0.0f, 1.0f);
RNA_def_property_ui_text(prop, "Ray Transparency Filter", "Amount to
blend in the material's diffuse color in raytraced transparency (simulating
absorption).");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_limit", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "limit", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "tx_limit");
RNA_def_property_range(prop, 0.0f, 100.0f);
RNA_def_property_ui_text(prop, "Ray Transparency Limit", "Maximum depth
for light to travel through the transparent material before becoming fully
filtered (0.0 is disabled).");
RNA_def_property_update(prop, NC_MATERIAL|ND_SHADING, NULL);
- prop= RNA_def_property(srna, "ray_transparency_falloff", PROP_FLOAT,
PROP_NONE);
+ prop= RNA_def_property(srna, "falloff", PROP_FLOAT, PROP_NONE);
RNA_def_property_float_sdna(prop, NULL, "tx_falloff");
RNA_def_property_range(prop, 0.1f, 10.0f);
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
