Commit: ffea67ca57a9a8e9876f7140037b0818ac99b4b9
Author: Bastien Montagne
Date: Wed Jul 23 20:59:13 2014 +0200
Branches: master
https://developer.blender.org/rBffea67ca57a9a8e9876f7140037b0818ac99b4b9
Updates/fixes for new UI messages.
===================================================================
M release/scripts/modules/bl_i18n_utils/utils_spell_check.py
M source/blender/editors/sculpt_paint/paint_curve.c
M source/blender/editors/sculpt_paint/paint_image.c
M source/blender/makesrna/intern/rna_brush.c
M source/blender/makesrna/intern/rna_userdef.c
===================================================================
diff --git a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
index 9947560..a887ebd 100644
--- a/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
+++ b/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
@@ -363,6 +363,7 @@ class SpellChecker():
"icosphere",
"inpaint",
"lightmap",
+ "linearlight",
"lossless", "lossy",
"matcap",
"midtones",
@@ -372,6 +373,7 @@ class SpellChecker():
"nurb", "nurbs",
"perlin",
"phong",
+ "pinlight",
"qi",
"radiosity",
"raycasting",
@@ -379,6 +381,7 @@ class SpellChecker():
"renderfarm",
"scanfill",
"shader", "shaders",
+ "softlight",
"specular", "specularity",
"spillmap",
"sobel",
@@ -386,6 +389,7 @@ class SpellChecker():
"tonemap",
"toon",
"timecode",
+ "vividlight",
"voronoi",
"voxel", "voxels",
"vsync",
diff --git a/source/blender/editors/sculpt_paint/paint_curve.c
b/source/blender/editors/sculpt_paint/paint_curve.c
index 6ca0a04..5c11ae8 100644
--- a/source/blender/editors/sculpt_paint/paint_curve.c
+++ b/source/blender/editors/sculpt_paint/paint_curve.c
@@ -562,7 +562,7 @@ void PAINTCURVE_OT_select(wmOperatorType *ot)
/* properties */
RNA_def_int_vector(ot->srna, "location", 2, NULL, 0, SHRT_MAX,
"Location", "Location of vertex in area space", 0,
SHRT_MAX);
- prop = RNA_def_boolean(ot->srna, "toggle", false, "Toggle",
"Select/Deselect all");
+ prop = RNA_def_boolean(ot->srna, "toggle", false, "Toggle", "(De)select
all");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
prop = RNA_def_boolean(ot->srna, "extend", false, "Extend", "Extend
selection");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
diff --git a/source/blender/editors/sculpt_paint/paint_image.c
b/source/blender/editors/sculpt_paint/paint_image.c
index 88b9f5b..0e76506 100644
--- a/source/blender/editors/sculpt_paint/paint_image.c
+++ b/source/blender/editors/sculpt_paint/paint_image.c
@@ -1392,7 +1392,7 @@ void paint_proj_mesh_data_ensure(bContext *C, Object *ob,
wmOperator *op)
layernum = CustomData_number_of_layers(&me->pdata, CD_MTEXPOLY);
if (layernum == 0) {
- BKE_reportf(op->reports, RPT_WARNING, "Object did not have UV
map. Recommend manual unwrap");
+ BKE_reportf(op->reports, RPT_WARNING, "Object did not have UV
map, manual unwrap recommended");
ED_mesh_uv_texture_add(me, "UVMap", true);
}
diff --git a/source/blender/makesrna/intern/rna_brush.c
b/source/blender/makesrna/intern/rna_brush.c
index e3dbbd2..1ff9927 100644
--- a/source/blender/makesrna/intern/rna_brush.c
+++ b/source/blender/makesrna/intern/rna_brush.c
@@ -56,7 +56,8 @@ static EnumPropertyItem sculpt_stroke_method_items[] = {
{BRUSH_AIRBRUSH, "AIRBRUSH", 0, "Airbrush", "Keep applying paint effect
while holding mouse (spray)"},
{BRUSH_ANCHORED, "ANCHORED", 0, "Anchored", "Keep the brush anchored to
the initial location"},
{BRUSH_LINE, "LINE", 0, "Line", "Draw a line with dabs separated
according to spacing"},
- {BRUSH_CURVE, "CURVE", 0, "Curve", "Define the stroke curve with a
bezier curve. Dabs are separated according to spacing"},
+ {BRUSH_CURVE, "CURVE", 0, "Curve",
+ "Define the stroke curve with a bezier curve (dabs are
separated according to spacing)"},
{0, NULL, 0, NULL, NULL}
};
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index cc1fb6f..cdc1e35 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -3967,19 +3967,22 @@ static void rna_def_userdef_system(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_userdef_text_update");
func = RNA_def_function(srna, "is_occlusion_query_supported",
"rna_Scene_GPU_selection_supported");
- parm = RNA_def_boolean(func, "is_supported", 0, "Occlusion Query
Support", "Check if GPU supports Occlusion Queries");
+ parm = RNA_def_boolean(func, "is_supported", 0, "Occlusion Query
Support",
+ "Check if GPU supports Occlusion Queries");
RNA_def_function_return(func, parm);
prop = RNA_def_property(srna, "select_method", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "gpu_select_method");
RNA_def_property_enum_items(prop, gpu_select_method_items);
- RNA_def_property_ui_text(prop, "Selection Method", "Use OpenGL
occlusion queries o selection rendermode to accelerate selection");
+ RNA_def_property_ui_text(prop, "Selection Method",
+ "Use OpenGL occlusion queries or selection
render mode to accelerate selection");
/* Full scene anti-aliasing */
prop = RNA_def_property(srna, "multi_sample", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_bitflag_sdna(prop, NULL, "ogl_multisamples");
RNA_def_property_enum_items(prop, multi_sample_levels);
- RNA_def_property_ui_text(prop, "MultiSample", "Enable OpenGL
multi-sampling, only for systems that support it, requires restart");
+ RNA_def_property_ui_text(prop, "MultiSample",
+ "Enable OpenGL multi-sampling, only for
systems that support it, requires restart");
prop = RNA_def_property(srna, "use_region_overlap", PROP_BOOLEAN,
PROP_NONE);
RNA_def_property_boolean_sdna(prop, NULL, "uiflag2",
USER_REGION_OVERLAP);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
