blender
/
blender
133
398
Fork 578
Code Issues 6.3k Pull Requests 744 Projects 19 Wiki Activity

WIP: Vulkan: Workbench #107886

Closed
Jeroen Bakker wants to merge 88 commits from Jeroen-Bakker:vulkan-draw-manager-workbench into main
pull from: Jeroen-Bakker:vulkan-draw-manager-workbench
merge into: blender:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 0 Commits 88 Files Changed 20 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 8771f92903 - Show all commits

2
scripts/startup/bl_ui/properties_particle.py
View File

@ -1720,7 +1720,7 @@ class PARTICLE_PT_children(ParticleButtonsPanel, Panel):
col = layout.column()
sub = col.column(align=True)
sub.prop(part, "child_nbr", text="Display Amount")
sub.prop(part, "child_percent", text="Display Amount")
sub.prop(part, "rendered_child_count", text="Render Amount")
col.separator()

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

@ -3144,9 +3144,7 @@ static void rna_def_particle_settings(BlenderRNA *brna)
/* children */
/* NOTE(@ideasman42): name is not following conventions: `nbr`.
* Could be changed next major version. */
prop = RNA_def_property(srna, "child_nbr", PROP_INT, PROP_NONE);
prop = RNA_def_property(srna, "child_percent", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(
prop, NULL, "child_percent"); /* Optional if prop names are the same. */
RNA_def_property_range(prop, 0, 100000);