Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Koenig <sebastian_k@gmail.com>2019-09-05 10:22:20 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-09-05 10:32:13 +0300
commit17baa43e5919521aedaa9e606b1a64d44e1ee387 (patch)
tree67a458b798863fff5f61be13e337af02e7f0644e
parentd813cc706d79daf84100f9090db5f11c917e50c0 (diff)
MovieClip: Make name of Active Clip consistent in UI
Using the currently active movie clip had different names in the interface: In scene context it was "Active Movie Clip", in Camera Background Images it was "Camera Clip", in Constraints it was "ActiveClip". I made all those instances use "Active Clip", which is descriptive enough and also the shortest of the three. Reviewed By: billreynish Differential Revision: https://developer.blender.org/D5400
-rw-r--r--release/scripts/startup/bl_ui/properties_data_camera.py4
-rw-r--r--release/scripts/startup/bl_ui/properties_scene.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_camera.py b/release/scripts/startup/bl_ui/properties_data_camera.py
index 32e99910d71..eef70056be8 100644
--- a/release/scripts/startup/bl_ui/properties_data_camera.py
+++ b/release/scripts/startup/bl_ui/properties_data_camera.py
@@ -289,7 +289,7 @@ class DATA_PT_camera_background_image(CameraButtonsPanel, Panel):
elif bg.source == 'MOVIE_CLIP' and bg.clip:
row.prop(bg.clip, "name", text="", emboss=False)
elif bg.source and bg.use_camera_clip:
- row.label(text="Camera Clip")
+ row.label(text="Active Clip")
else:
row.label(text="Not Set")
@@ -329,7 +329,7 @@ class DATA_PT_camera_background_image(CameraButtonsPanel, Panel):
sub.template_image_stereo_3d(bg.image.stereo_3d_format)
elif bg.source == 'MOVIE_CLIP':
- box.prop(bg, "use_camera_clip")
+ box.prop(bg, "use_camera_clip", text="Active Clip")
column = box.column()
column.active = not bg.use_camera_clip
diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py
index 60a7751e910..0b4ca2902c1 100644
--- a/release/scripts/startup/bl_ui/properties_scene.py
+++ b/release/scripts/startup/bl_ui/properties_scene.py
@@ -63,7 +63,7 @@ class SCENE_PT_scene(SceneButtonsPanel, Panel):
layout.prop(scene, "camera")
layout.prop(scene, "background_set")
- layout.prop(scene, "active_clip")
+ layout.prop(scene, "active_clip", text="Active Clip")
class SCENE_PT_unit(SceneButtonsPanel, Panel):