Commit: cee8a3148ca6c4c970a6f4e2b5c896b11d877496
Author: Bastien Montagne
Date: Mon Oct 12 21:34:14 2015 +0200
Branches: master
https://developer.blender.org/rBcee8a3148ca6c4c970a6f4e2b5c896b11d877496
Usual UI message fixes...
===================================================================
M source/blender/editors/transform/transform_ops.c
M source/blender/makesrna/intern/rna_actuator.c
M source/blender/windowmanager/intern/wm_operators.c
===================================================================
diff --git a/source/blender/editors/transform/transform_ops.c
b/source/blender/editors/transform/transform_ops.c
index 4ad3860..ceec729 100644
--- a/source/blender/editors/transform/transform_ops.c
+++ b/source/blender/editors/transform/transform_ops.c
@@ -851,8 +851,10 @@ static void TRANSFORM_OT_edge_slide(struct wmOperatorType
*ot)
prop = RNA_def_boolean(ot->srna, "single_side", false, "Single Side",
"");
RNA_def_property_flag(prop, PROP_HIDDEN | PROP_SKIP_SAVE);
- RNA_def_boolean(ot->srna, "use_even", false, "Even", "Makes the edge
loop match the shape of the adjacent edge loop.");
- RNA_def_boolean(ot->srna, "flipped", false, "Flipped", "When Even mode
is active, flips between the two adjacent edge loops");
+ RNA_def_boolean(ot->srna, "use_even", false, "Even",
+ "Make the edge loop match the shape of the adjacent
edge loop");
+ RNA_def_boolean(ot->srna, "flipped", false, "Flipped",
+ "When Even mode is active, flips between the two
adjacent edge loops");
Transform_Properties(ot, P_MIRROR | P_SNAP | P_CORRECT_UV);
}
@@ -873,8 +875,10 @@ static void TRANSFORM_OT_vert_slide(struct wmOperatorType
*ot)
ot->poll = ED_operator_editmesh_region_view3d;
RNA_def_float_factor(ot->srna, "value", 0, -10.0f, 10.0f, "Factor", "",
-1.0f, 1.0f);
- RNA_def_boolean(ot->srna, "use_even", false, "Even", "Makes the edge
loop match the shape of the adjacent edge loop.");
- RNA_def_boolean(ot->srna, "flipped", false, "Flipped", "When Even mode
is active, flips between the two adjacent edge loops");
+ RNA_def_boolean(ot->srna, "use_even", false, "Even",
+ "Make the edge loop match the shape of the adjacent
edge loop");
+ RNA_def_boolean(ot->srna, "flipped", false, "Flipped",
+ "When Even mode is active, flips between the two
adjacent edge loops");
Transform_Properties(ot, P_MIRROR | P_SNAP | P_CORRECT_UV);
}
diff --git a/source/blender/makesrna/intern/rna_actuator.c
b/source/blender/makesrna/intern/rna_actuator.c
index 01ca352..b425a45 100644
--- a/source/blender/makesrna/intern/rna_actuator.c
+++ b/source/blender/makesrna/intern/rna_actuator.c
@@ -1723,8 +1723,8 @@ static void rna_def_game_actuator(BlenderRNA *brna)
/* ACT_GAME_LOAD */
prop = RNA_def_property(srna, "filename", PROP_STRING, PROP_FILEPATH);
RNA_def_property_ui_text(prop, "File",
- "The file to use depending on the mode (e.g.,
the blend file to load or a destination "
- "for saving a screenshot). Use the \"//\"
prefix for a relative path");
+ "The file to use, depending on the mode (e.g.
the blend file to load or a destination "
+ "for saving a screenshot) - use the \"//\"
prefix for a relative path");
RNA_def_property_update(prop, NC_LOGIC, NULL);
/*XXX to do: an operator that calls file_browse with relative_path on
and blender filtering active */
}
diff --git a/source/blender/windowmanager/intern/wm_operators.c
b/source/blender/windowmanager/intern/wm_operators.c
index 6ccd2aa..1245430 100644
--- a/source/blender/windowmanager/intern/wm_operators.c
+++ b/source/blender/windowmanager/intern/wm_operators.c
@@ -2807,7 +2807,7 @@ static int wm_link_append_exec(bContext *C, wmOperator
*op)
/* sanity checks for flag */
if (scene && scene->id.lib) {
BKE_reportf(op->reports, RPT_WARNING,
- "Scene '%s' is linked, instanciation of objects &
groups is disabled", scene->id.name + 2);
+ "Scene '%s' is linked, instantiation of objects &
groups is disabled", scene->id.name + 2);
flag &= ~FILE_GROUP_INSTANCE;
scene = NULL;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
