diff options
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_modifier.py')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 942882a9053..e3cc08ce3d8 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -711,11 +711,15 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): def PARTICLE_INSTANCE(self, layout, ob, md): layout.prop(md, "object") - layout.prop(md, "particle_system_index", text="Particle System") + if md.object: + layout.prop_search(md, "particle_system", md.object, "particle_systems", text="Particle System") + else: + layout.prop(md, "particle_system_index", text="Particle System") split = layout.split() col = split.column() col.label(text="Create From:") + layout.prop(md, "space", text="") col.prop(md, "use_normal") col.prop(md, "use_children") col.prop(md, "use_size") @@ -726,6 +730,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "show_unborn") col.prop(md, "show_dead") + row = layout.row(align=True) + row.prop(md, "particle_amount", text="Amount") + row.prop(md, "particle_offset", text="Offset") + layout.separator() layout.prop(md, "use_path", text="Create Along Paths") @@ -737,8 +745,16 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "use_preserve_shape") col = split.column() - col.prop(md, "position", slider=True) - col.prop(md, "random_position", text="Random", slider=True) + col2 = col.column(align=True) + col2.prop(md, "position", slider=True) + col2.prop(md, "random_position", text="Random", slider=True) + col2 = col.column(align=True) + col2.prop(md, "rotation", slider=True) + col2.prop(md, "random_rotation", text="Random", slider=True) + + col = layout.column() + col.prop_search(md, "index_layer_name", ob.data, "vertex_colors", text="Index Layer") + col.prop_search(md, "value_layer_name", ob.data, "vertex_colors", text="Value Layer") def PARTICLE_SYSTEM(self, layout, ob, md): layout.label(text="Settings can be found inside the Particle context") |