[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57518] branches/soc-2013-depsgraph_mt: Merging r57514 through r57517 rom trunk into soc-2013-depsgraph_mt
Sergey Sharybin
sergey.vfx at gmail.com
Mon Jun 17 13:26:21 CEST 2013
Revision: 57518
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57518
Author: nazgul
Date: 2013-06-17 11:26:21 +0000 (Mon, 17 Jun 2013)
Log Message:
-----------
Merging r57514 through r57517 rom trunk into soc-2013-depsgraph_mt
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57514
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57517
Modified Paths:
--------------
branches/soc-2013-depsgraph_mt/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_edit.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c
Property Changed:
----------------
branches/soc-2013-depsgraph_mt/
branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-depsgraph_mt
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57513
+ /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57395-57517
Modified: branches/soc-2013-depsgraph_mt/release/scripts/modules/bl_i18n_utils/utils_spell_check.py
===================================================================
--- branches/soc-2013-depsgraph_mt/release/scripts/modules/bl_i18n_utils/utils_spell_check.py 2013-06-17 11:18:29 UTC (rev 57517)
+++ branches/soc-2013-depsgraph_mt/release/scripts/modules/bl_i18n_utils/utils_spell_check.py 2013-06-17 11:26:21 UTC (rev 57518)
@@ -58,6 +58,7 @@
"arcsine", "arccosine", "arctangent",
"autoclip",
"autocomplete",
+ "autoexec",
"autoname",
"autosave",
"autoscale",
@@ -437,6 +438,7 @@
"oren",
"prewitt",
"runge",
+ "sobol",
"verlet",
"worley",
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/interface/interface.c
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender/source/blender/editors/interface/interface.c:57395-57513
+ /branches/ge_candy/source/blender/editors/interface/interface.c:45070-46163
/branches/ge_harmony/source/blender/editors/interface/interface.c:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber/source/blender/editors/interface/interface.c:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato/source/blender/editors/interface/interface.c:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender/source/blender/editors/interface/interface.c:57395-57517
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c 2013-06-17 11:18:29 UTC (rev 57517)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/object/object_vgroup.c 2013-06-17 11:26:21 UTC (rev 57518)
@@ -2905,9 +2905,9 @@
ot->flag = /*OPTYPE_REGISTER|*/ OPTYPE_UNDO;
/* properties */
- prop = RNA_def_boolean(ot->srna, "use_all_groups", 0, "All Groups", "Remove from all Groups");
+ prop = RNA_def_boolean(ot->srna, "use_all_groups", 0, "All Groups", "Remove from all groups");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
- prop = RNA_def_boolean(ot->srna, "use_all_verts", 0, "All verts", "Clear Active Group");
+ prop = RNA_def_boolean(ot->srna, "use_all_verts", 0, "All Verts", "Clear the active group");
RNA_def_property_flag(prop, PROP_SKIP_SAVE);
}
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_edit.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_edit.c 2013-06-17 11:18:29 UTC (rev 57517)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/space_nla/nla_edit.c 2013-06-17 11:26:21 UTC (rev 57518)
@@ -425,8 +425,7 @@
if (items == 0) {
BKE_report(op->reports, RPT_ERROR,
- "No active track(s) to add strip to. "
- "Select an existing track or add one before trying again");
+ "No active track(s) to add strip to, select an existing track or add one before trying again");
return OPERATOR_CANCELLED;
}
Property changes on: branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender/source/blender/editors/space_outliner:57395-57513
+ /branches/soc-2011-cucumber/source/blender/editors/space_outliner:38968,38970,38973,39045,40845
/branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/branches/soc-2011-tomato/source/blender/editors/space_outliner:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126,52854-52856,54573
/trunk/blender/source/blender/editors/space_outliner:57395-57517
Modified: branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c
===================================================================
--- branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c 2013-06-17 11:18:29 UTC (rev 57517)
+++ branches/soc-2013-depsgraph_mt/source/blender/editors/space_view3d/view3d_buttons.c 2013-06-17 11:26:21 UTC (rev 57518)
@@ -1183,7 +1183,7 @@
uiDefIconBut(block, BUT, B_VGRP_PNL_DELETE_SINGLE + i, ICON_X,
xco, yco, (x = UI_UNIT_X), UI_UNIT_Y,
- NULL, 0, 0, 0, 0, TIP_("Delete this weight from the vertex."));
+ NULL, 0, 0, 0, 0, TIP_("Delete this weight from the vertex"));
xco += x;
yco -= UI_UNIT_Y;
More information about the Bf-blender-cvs
mailing list