diff options
| author | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 13:10:39 +0300 |
|---|---|---|
| committer | Lukas Tönne <lukas.toenne@gmail.com> | 2015-01-20 13:10:39 +0300 |
| commit | 00d4bf4ce8c95c250bfeec277c51eca20a82f301 (patch) | |
| tree | cd18be2459a08af30de465e8b27f01356ac85c55 /intern/cycles/blender/addon/ui.py | |
| parent | 6f7ef81bb45a3066d1ca35f5311ed0145a09843c (diff) | |
| parent | b22a38786df7c3c7a785393bcca03f6b3b7c620a (diff) | |
Merge branch 'master' into gooseberry
Conflicts:
release/scripts/startup/bl_ui/properties_particle.py
source/blender/blenkernel/BKE_cloth.h
source/blender/blenkernel/intern/cloth.c
source/blender/blenkernel/intern/collision.c
source/blender/blenkernel/intern/particle.c
source/blender/blenkernel/intern/particle_system.c
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/physics/particle_edit.c
source/blender/makesdna/DNA_particle_types.h
source/blender/physics/BPH_mass_spring.h
source/blender/physics/intern/BPH_mass_spring.cpp
source/blender/physics/intern/implicit_blender.c
Diffstat (limited to 'intern/cycles/blender/addon/ui.py')
| -rw-r--r-- | intern/cycles/blender/addon/ui.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/intern/cycles/blender/addon/ui.py b/intern/cycles/blender/addon/ui.py index 521bf46c7c5..2e09c2fb5d4 100644 --- a/intern/cycles/blender/addon/ui.py +++ b/intern/cycles/blender/addon/ui.py @@ -1418,6 +1418,7 @@ def get_panels(): "DATA_PT_vertex_colors", "DATA_PT_camera", "DATA_PT_camera_display", + "DATA_PT_camera_safe_areas", "DATA_PT_lens", "DATA_PT_speaker", "DATA_PT_distance", |