archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Revert recent change to the particles RNA, and only affect the UI.

Browse Source 
Even though the name change is more correct, we don't want to change the API at this time.
This commit is contained in:
William Reynish
2020-01-08 20:37:35 +01:00
parent e72ecaa371
commit c3b406a7c3
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/blender/blender_curves.cpp
View File

@@ -152,8 +152,8 @@ static bool ObtainCacheParticleData(
float radius = b_part.radius_scale() * 0.5f;
CData->psys_rootradius.push_back_slow(radius * b_part.root_diameter());
CData->psys_tipradius.push_back_slow(radius * b_part.tip_diameter());
CData->psys_rootradius.push_back_slow(radius * b_part.root_radius());
CData->psys_tipradius.push_back_slow(radius * b_part.tip_radius());
CData->psys_shape.push_back_slow(b_part.shape());
CData->psys_closetip.push_back_slow(b_part.use_close_tip());

4
release/scripts/startup/bl_ui/properties_particle.py
View File

@@ -1961,8 +1961,8 @@ class PARTICLE_PT_hair_shape(ParticleButtonsPanel, Panel):
layout.prop(part, "shape", text="Strand Shape")
col = layout.column(align=True)
col.prop(part, "root_diameter", text="Diameter Root")
col.prop(part, "tip_diameter", text="Tip")
col.prop(part, "root_radius", text="Diameter Root")
col.prop(part, "tip_radius", text="Tip")
col = layout.column()
col.prop(part, "radius_scale")

8
source/blender/makesrna/intern/rna_particle.c
View File

@@ -3415,19 +3415,19 @@ static void rna_def_particle_settings(BlenderRNA *brna)
RNA_def_property_update(
prop, 0, "rna_Particle_redo"); /* TODO: Only need to tell the render engine to update. */
prop = RNA_def_property(srna, "root_diameter", PROP_FLOAT, PROP_DISTANCE);
prop = RNA_def_property(srna, "root_radius", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "rad_root");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 2);
RNA_def_property_ui_text(prop, "Root", "Strand diameter width at the root");
RNA_def_property_ui_text(prop, "Root Diameter", "Strand diameter width at the root");
RNA_def_property_update(
prop, 0, "rna_Particle_redo"); /* TODO: Only need to tell the render engine to update. */
prop = RNA_def_property(srna, "tip_diameter", PROP_FLOAT, PROP_DISTANCE);
prop = RNA_def_property(srna, "tip_radius", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "rad_tip");
RNA_def_property_range(prop, 0.0f, FLT_MAX);
RNA_def_property_ui_range(prop, 0.0f, 10.0f, 0.1, 2);
RNA_def_property_ui_text(prop, "Tip", "Strand diameter width at the tip");
RNA_def_property_ui_text(prop, "Tip Diameter", "Strand diameter width at the tip");
RNA_def_property_update(
prop, 0, "rna_Particle_redo"); /* TODO: Only need to tell the render engine to update. */