diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-12-21 18:29:14 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-12-21 18:43:24 +0300 |
| commit | b89f2276e502da6480b4ceeb414b0e6b79e4edfe (patch) | |
| tree | 77d5756979af9137e645fcdfc3fff5dc36702b4a /release | |
| parent | 103dd660573bb77b8917387bb2773a96de56fb38 (diff) | |
Implement duplicator viewport/render visibility options
This allows a duplicator (as known as dupli parent) to be in a visible
collection so its duplicated objects are visible, however while being
invisible for the final render.
An object that is a particle emitter is also considered a duplicator.
Many thanks for the reviewers for the extense feedback.
Reviewers: sergey, campbellbarton
Differential Revision: https://developer.blender.org/D2966
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_object.py | 7 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_particle.py | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_object.py b/release/scripts/startup/bl_ui/properties_object.py index 23787756121..de608c42cb5 100644 --- a/release/scripts/startup/bl_ui/properties_object.py +++ b/release/scripts/startup/bl_ui/properties_object.py @@ -278,6 +278,13 @@ class OBJECT_PT_display(ObjectButtonsPanel, Panel): col.label(text="Object Color:") col.prop(obj, "color", text="") + col = layout.column() + col.active = bool(is_dupli or obj.particle_systems) + col.label(text="Duplicator Visibility:") + row = col.row(align=True) + row.prop(obj, "show_duplicator_for_viewport", text="Viewport") + row.prop(obj, "show_duplicator_for_render", text="Render") + class OBJECT_PT_duplication(ObjectButtonsPanel, Panel): bl_label = "Duplication" diff --git a/release/scripts/startup/bl_ui/properties_particle.py b/release/scripts/startup/bl_ui/properties_particle.py index a5793e6d9a9..fda3096a3f5 100644 --- a/release/scripts/startup/bl_ui/properties_particle.py +++ b/release/scripts/startup/bl_ui/properties_particle.py @@ -926,7 +926,6 @@ class PARTICLE_PT_render(ParticleButtonsPanel, Panel): split = layout.split() col = split.column() - col.prop(part, "use_render_emitter") col.prop(part, "use_parent_particles") col = split.column() |