[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57880] branches/soc-2013-cycles_mblur: Merged trunk into branch.
Gavin Howard
gavin.d.howard at gmail.com
Sat Jun 29 18:33:17 CEST 2013
Revision: 57880
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57880
Author: gdh
Date: 2013-06-29 16:33:16 +0000 (Sat, 29 Jun 2013)
Log Message:
-----------
Merged trunk into branch. Includes r57865 to r57869.
I had to merge again because I was getting compile errors from a bad
commit. I guess that's a lesson to me to always update Blender and
compile it first. I wouldn't have this problem then.
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57865
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57869
Modified Paths:
--------------
branches/soc-2013-cycles_mblur/source/blender/blenfont/SConscript
branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
branches/soc-2013-cycles_mblur/source/blender/editors/animation/fmodifier_ui.c
branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_edit.c
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c
branches/soc-2013-cycles_mblur/source/blender/nodes/composite/nodes/node_composite_colorcorrection.c
branches/soc-2013-cycles_mblur/source/creator/creator.c
Property Changed:
----------------
branches/soc-2013-cycles_mblur/
branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/
Property changes on: branches/soc-2013-cycles_mblur
___________________________________________________________________
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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57867
+ /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
/branches/soc-2013-depsgraph_mt:57516
/tags/blender-2.67b-release/blender:57122
/trunk/blender:57388-57879
Modified: branches/soc-2013-cycles_mblur/source/blender/blenfont/SConscript
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenfont/SConscript 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/blenfont/SConscript 2013-06-29 16:33:16 UTC (rev 57880)
@@ -55,4 +55,7 @@
if env['WITH_BF_INTERNATIONAL']:
defs.append('WITH_INTERNATIONAL')
+if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc', 'win64-mingw'):
+ incs.append(env['BF_PTHREADS_INC'])
+
env.BlenderLib('bf_blenfont', sources, incs, defines=defs, libtype=['core', 'player'], priority=[210, 210])
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/BKE_mesh.h 2013-06-29 16:33:16 UTC (rev 57880)
@@ -146,7 +146,7 @@
void BKE_mesh_flush_hidden_from_polys_ex(struct MVert *mvert,
const struct MLoop *mloop,
- struct MEdge *medge, int totedge,
+ struct MEdge *medge, const int totedge,
const struct MPoly *mpoly, const int totpoly);
void BKE_mesh_flush_hidden_from_polys(struct Mesh *me);
Modified: branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/blenkernel/intern/mesh.c 2013-06-29 16:33:16 UTC (rev 57880)
@@ -3938,7 +3938,10 @@
{
BLI_assert(ELEM3(type, ME_VSEL, ME_ESEL, ME_FSEL));
- if (me->totselect) {
+ /* XXX how can it be that sometimes me->mselect is NULL here ?
+ It happens, but its not clear why it happens!
+ */
+ if (me->totselect && me->mselect) {
if (me->mselect[me->totselect - 1].type == type) {
return me->mselect[me->totselect - 1].index;
}
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/animation/fmodifier_ui.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/animation/fmodifier_ui.c 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/animation/fmodifier_ui.c 2013-06-29 16:33:16 UTC (rev 57880)
@@ -138,7 +138,7 @@
/* draw polynomial order selector */
row = uiLayoutRow(layout, FALSE);
block = uiLayoutGetBlock(row);
- but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5*UI_UNIT_X, 0, bwidth, UI_UNIT_Y,
+ but = uiDefButI(block, NUM, B_FMODIFIER_REDRAW, IFACE_("Poly Order:"), 0.5f * UI_UNIT_X, 0, bwidth, UI_UNIT_Y,
&data->poly_order, 1, 100, 0, 0,
TIP_("'Order' of the Polynomial (for a polynomial with n terms, 'order' is n-1)"));
uiButSetFunc(but, validate_fmodifier_cb, fcm, NULL);
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/object/object_vgroup.c 2013-06-29 16:33:16 UTC (rev 57880)
@@ -2982,7 +2982,8 @@
return 0;
if (!(vgroup_object_in_edit_mode(ob) ||
- vgroup_object_in_wpaint_vert_select(ob))) {
+ vgroup_object_in_wpaint_vert_select(ob)))
+ {
return 0;
}
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_edit.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_edit.c 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/screen/screen_edit.c 2013-06-29 16:33:16 UTC (rev 57880)
@@ -1639,7 +1639,7 @@
if (sl->spacetype == SPACE_IMAGE) {
SpaceImage *sima = sa->spacedata.first;
- if(sima->flag & (SI_PREVSPACE|SI_FULLWINDOW)) {
+ if (sima->flag & (SI_PREVSPACE | SI_FULLWINDOW)) {
sima->flag &= ~SI_PREVSPACE;
sima->flag &= ~SI_FULLWINDOW;
ED_screen_full_prevspace(C, sa);
Property changes on: branches/soc-2013-cycles_mblur/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
/branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner:57516
/trunk/blender/source/blender/editors/space_outliner:57388-57867
+ /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
/branches/soc-2013-depsgraph_mt/source/blender/editors/space_outliner:57516
/trunk/blender/source/blender/editors/space_outliner:57388-57879
Modified: branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/editors/space_outliner/outliner_draw.c 2013-06-29 16:33:16 UTC (rev 57880)
@@ -1059,9 +1059,9 @@
dx = (int)UI_GetStringWidth(te->name);
- if (dx < 5*UI_UNIT_X) dx = 5*UI_UNIT_X;
+ if (dx < 5 * UI_UNIT_X) dx = 5 * UI_UNIT_X;
spx = te->xs + 1.8f * UI_UNIT_X;
- if (spx + dx + 0.5f*UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f*UI_UNIT_X;
+ if (spx + dx + 0.5f * UI_UNIT_X > ar->v2d.cur.xmax) dx = ar->v2d.cur.xmax - spx - 0.5f * UI_UNIT_X;
bt = uiDefBut(block, TEX, OL_NAMEBUTTON, "", spx, (int)te->ys, dx + UI_UNIT_X, UI_UNIT_Y - 1, (void *)te->name,
1.0, (float)len, 0, 0, "");
Modified: branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c
===================================================================
--- branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c 2013-06-29 12:13:59 UTC (rev 57879)
+++ branches/soc-2013-cycles_mblur/source/blender/makesrna/intern/rna_wm.c 2013-06-29 16:33:16 UTC (rev 57880)
@@ -1598,32 +1598,32 @@
prop = RNA_def_property(srna, "mouse_x", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "x");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Mouse X Position", "The window relative vertical location of the mouse");
+ RNA_def_property_ui_text(prop, "Mouse X Position", "The window relative horizontal location of the mouse");
prop = RNA_def_property(srna, "mouse_y", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "y");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Mouse Y Position", "The window relative horizontal location of the mouse");
+ RNA_def_property_ui_text(prop, "Mouse Y Position", "The window relative vertical location of the mouse");
prop = RNA_def_property(srna, "mouse_region_x", PROP_INT, PROP_NONE);
RNA_def_property_int_sdna(prop, NULL, "mval[0]");
RNA_def_property_clear_flag(prop, PROP_EDITABLE);
- RNA_def_property_ui_text(prop, "Mouse X Position", "The region relative vertical location of the mouse");
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list