diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-06-17 18:44:04 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-06-17 18:44:08 +0300 |
| commit | 83c28ff96a5745c7f5713665890211657b45a35f (patch) | |
| tree | 9e6d2fba2b6b0d0d9e55b283b664b1d304f39708 /source | |
| parent | 54f0f87a4b715deeece0ceb6f78ab325ba598e35 (diff) | |
| parent | 8bf108dd4899c5168f08ae459e9750f493a3cf32 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/editors/gpencil/gpencil_edit.c | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_sequencer.c | 4 | ||||
| -rw-r--r-- | source/blender/python/intern/bpy_props.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/gpencil/gpencil_edit.c b/source/blender/editors/gpencil/gpencil_edit.c index 1d70d3685c7..6310cab9e4e 100644 --- a/source/blender/editors/gpencil/gpencil_edit.c +++ b/source/blender/editors/gpencil/gpencil_edit.c @@ -846,7 +846,7 @@ void GPENCIL_OT_blank_frame_add(wmOperatorType *ot) /* identifiers */ ot->name = "Insert Blank Frame"; ot->idname = "GPENCIL_OT_blank_frame_add"; - ot->description = "Inserts a blank frame on the current frame " + ot->description = "Insert a blank frame on the current frame " "(all subsequently existing frames, if any, are shifted right by one frame)"; /* callbacks */ diff --git a/source/blender/makesrna/intern/rna_sequencer.c b/source/blender/makesrna/intern/rna_sequencer.c index 84b62721999..6f8aa32da86 100644 --- a/source/blender/makesrna/intern/rna_sequencer.c +++ b/source/blender/makesrna/intern/rna_sequencer.c @@ -1126,7 +1126,7 @@ static void rna_def_strip_crop(BlenderRNA *brna) prop = RNA_def_property(srna, "min_y", PROP_INT, PROP_UNSIGNED); RNA_def_property_int_sdna(prop, NULL, "bottom"); - RNA_def_property_ui_text(prop, "Bottom", "Number of pixels to crop from the buttom"); + RNA_def_property_ui_text(prop, "Bottom", "Number of pixels to crop from the bottom"); RNA_def_property_ui_range(prop, 0, 4096, 1, -1); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_SequenceCrop_update"); @@ -2338,7 +2338,7 @@ static void rna_def_text(StructRNA *srna) prop = RNA_def_property(srna, "shadow_color", PROP_FLOAT, PROP_COLOR_GAMMA); RNA_def_property_float_sdna(prop, NULL, "shadow_color"); - RNA_def_property_ui_text(prop, "Shadow Color", "Shadow color"); + RNA_def_property_ui_text(prop, "Shadow Color", ""); RNA_def_property_update(prop, NC_SCENE | ND_SEQUENCER, "rna_Sequence_update"); prop = RNA_def_property(srna, "location", PROP_FLOAT, PROP_XYZ); diff --git a/source/blender/python/intern/bpy_props.c b/source/blender/python/intern/bpy_props.c index 2656e612b18..20faa5aa576 100644 --- a/source/blender/python/intern/bpy_props.c +++ b/source/blender/python/intern/bpy_props.c @@ -2862,7 +2862,7 @@ PyDoc_STRVAR(BPy_PointerProperty_doc, "name=\"\", " "description=\"\", " "options={'ANIMATABLE'}, " - "update=None,\n" + "update=None, " "poll=None)\n" "\n" " Returns a new pointer property definition.\n" |