diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-14 13:36:56 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-04-14 13:39:54 +0300 |
| commit | 95b36321126fd6f9563b309930ac9ae6cf422a81 (patch) | |
| tree | 0722b78d4ffc69d49926d34d7ac0a9816c30dacd /source/blender/editors | |
| parent | 6cda217a82078d7bdf61caec458154a507a58947 (diff) | |
| parent | 0b55b8cc6a37fa4e74c55c9ccb54950c5f546bd6 (diff) | |
Merge branch 'master' into blender2.8
Conflicts:
source/blender/alembic/intern/abc_exporter.cc
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/object/object_modifier.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/render/render_shading.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/sound/sound_ops.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/object/object_modifier.c b/source/blender/editors/object/object_modifier.c index fb309dc979b..d614be175f2 100644 --- a/source/blender/editors/object/object_modifier.c +++ b/source/blender/editors/object/object_modifier.c @@ -793,7 +793,7 @@ void OBJECT_OT_modifier_add(wmOperatorType *ot) /* identifiers */ ot->name = "Add Modifier"; - ot->description = "Add a modifier to the active object"; + ot->description = "Add a procedural operation/effect to the active object"; ot->idname = "OBJECT_OT_modifier_add"; /* api callbacks */ diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index b58bd43a35e..e031e9a641c 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -612,7 +612,7 @@ void WORLD_OT_new(wmOperatorType *ot) /* identifiers */ ot->name = "New World"; ot->idname = "WORLD_OT_new"; - ot->description = "Add a new world"; + ot->description = "Create a new world Data-Block"; /* api callbacks */ ot->exec = new_world_exec; diff --git a/source/blender/editors/sound/sound_ops.c b/source/blender/editors/sound/sound_ops.c index 8eaa0039756..d103530fa81 100644 --- a/source/blender/editors/sound/sound_ops.c +++ b/source/blender/editors/sound/sound_ops.c @@ -670,7 +670,7 @@ static void SOUND_OT_mixdown(wmOperatorType *ot) /* identifiers */ ot->name = "Mixdown"; - ot->description = "Mixes the scene's audio to a sound file"; + ot->description = "Mix the scene's audio to a sound file"; ot->idname = "SOUND_OT_mixdown"; /* api callbacks */ |