Revision: 51232
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51232
Author: nazgul
Date: 2012-10-09 18:20:56 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Merging revision 51226 and 51227 from trunk into 2.64a tag
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51226
Modified Paths:
--------------
tags/blender-2.64a-release/blender/intern/elbeem/intern/utilities.cpp
tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/cloth.c
Property Changed:
----------------
tags/blender-2.64a-release/blender/
tags/blender-2.64a-release/blender/source/blender/editors/interface/interface.c
tags/blender-2.64a-release/blender/source/blender/editors/space_outliner/
Property changes on: tags/blender-2.64a-release/blender
___________________________________________________________________
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
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51176,51181,51184-51186,51191,51209,51219-51220
+
/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
/trunk/blender:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51176,51181,51184-51186,51191,51209,51219-51220,51226-51227
Modified: tags/blender-2.64a-release/blender/intern/elbeem/intern/utilities.cpp
===================================================================
--- tags/blender-2.64a-release/blender/intern/elbeem/intern/utilities.cpp
2012-10-09 17:30:33 UTC (rev 51231)
+++ tags/blender-2.64a-release/blender/intern/elbeem/intern/utilities.cpp
2012-10-09 18:20:56 UTC (rev 51232)
@@ -51,7 +51,7 @@
return gElbeemState;
}
int isSimworldOk(void) {
- return (getElbeemState>=0);
+ return (getElbeemState() >=0);
}
// last error as string, acces with get/setElbeemErrorString
Modified:
tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/cloth.c
===================================================================
--- tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/cloth.c
2012-10-09 17:30:33 UTC (rev 51231)
+++ tags/blender-2.64a-release/blender/source/blender/blenkernel/intern/cloth.c
2012-10-09 18:20:56 UTC (rev 51232)
@@ -773,11 +773,13 @@
else
verts->goal= 0.0f;
+ /* Reset vertex flags */
+ verts->flags &= ~CLOTH_VERT_FLAG_PINNED;
+ verts->flags &= ~CLOTH_VERT_FLAG_NOSELFCOLL;
+
dvert = dm->getVertData ( dm, i, CD_MDEFORMVERT );
if ( dvert ) {
-
for ( j = 0; j < dvert->totweight; j++ ) {
- verts->flags &= ~CLOTH_VERT_FLAG_PINNED;
if (( dvert->dw[j].def_nr ==
(clmd->sim_parms->vgroup_mass-1)) && (clmd->sim_parms->flags &
CLOTH_SIMSETTINGS_FLAG_GOAL )) {
verts->goal = dvert->dw
[j].weight;
@@ -789,7 +791,7 @@
*/
verts->goal =
powf(verts->goal, 4.0f);
- if ( verts->goal >=SOFTGOALSNAP
)
+ if ( verts->goal >=
SOFTGOALSNAP )
verts->flags |=
CLOTH_VERT_FLAG_PINNED;
}
@@ -804,7 +806,6 @@
}
}
- verts->flags &=
~CLOTH_VERT_FLAG_NOSELFCOLL;
if (clmd->coll_parms->flags &
CLOTH_COLLSETTINGS_FLAG_SELF ) {
if ( dvert->dw[j].def_nr ==
(clmd->coll_parms->vgroup_selfcol-1)) {
if (dvert->dw
[j].weight > 0.0f) {
Property changes on:
tags/blender-2.64a-release/blender/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
/trunk/blender/source/blender/editors/interface/interface.c:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191,51209,51219-51220
+ /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
/trunk/blender/source/blender/editors/interface/interface.c:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191,51209,51219-51220,51226-51227
Property changes on:
tags/blender-2.64a-release/blender/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
/trunk/blender/source/blender/editors/space_outliner:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191,51209,51219-51220
+
/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
/trunk/blender/source/blender/editors/space_outliner:51017-51025,51041-51043,51050,51056-51057,51060,51072,51074-51076,51079-51081,51083-51084,51105-51106,51108,51111-51112,51132,51143,51149,51158,51162,51168,51181,51184-51186,51191,51209,51219-51220,51226-51227
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
