griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Usual UI message fixes...

Browse Source
This commit is contained in:
Bastien Montagne
2015-10-12 21:34:14 +02:00
parent cdd727b7ce
commit cee8a3148c
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/editors/transform/transform_ops.c
View File

@@ -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);
}

4
source/blender/makesrna/intern/rna_actuator.c
View File

@@ -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 */
}

2
source/blender/windowmanager/intern/wm_operators.c
View File

@@ -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;
}