Revision: 42293
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42293
Author: campbellbarton
Date: 2011-11-30 10:07:04 +0000 (Wed, 30 Nov 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42290:42292
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42290
Modified Paths:
--------------
branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42290
+ /branches/soc-2011-cucumber:37517
/trunk/blender:39992-42292
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-42290
+ /trunk/blender/release:31524-42292
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
2011-11-30 10:04:14 UTC (rev 42292)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/deform.c
2011-11-30 10:07:04 UTC (rev 42293)
@@ -561,7 +561,7 @@
if (dw_new)
return dw_new;
- dw_new= BLI_cellalloc_calloc(sizeof(MDeformWeight)*(dv->totweight+1),
"deformWeight");
+ dw_new=
BLI_cellalloc_calloc(sizeof(MDeformWeight)*(dvert->totweight+1),
"deformWeight");
if (dvert->dw) {
memcpy(dw_new, dvert->dw,
sizeof(MDeformWeight)*dvert->totweight);
BLI_cellalloc_free(dvert->dw);
Modified: branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-30 10:04:14 UTC (rev 42292)
+++ branches/bmesh/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-30 10:07:04 UTC (rev 42293)
@@ -1703,25 +1703,16 @@
MDeformWeight
*def_weight = defvert_find_index(dv, defgrp_index);
/* skip if
weight value is 0 and no existing weight is found */
- if (!def_weight
&& !weight[i])
-
continue;
+ if ((def_weight
!= NULL) || (weight[i] != 0.0f)) {
- /* if not
found, add a weight for it */
- if
(!def_weight) {
-
MDeformWeight *newdw = MEM_callocN(sizeof(MDeformWeight)*(dv->totweight+1),
-
"deformWeight");
-
if(dv->dw){
-
memcpy(newdw, dv->dw, sizeof(MDeformWeight)*dv->totweight);
-
MEM_freeN(dv->dw);
+ /* if
not found, add a weight for it */
+ if
(def_weight == NULL) {
+
def_weight= defvert_verify_index(dv, defgrp_index);
}
-
dv->dw=newdw;
-
dv->dw[dv->totweight].def_nr=defgrp_index;
-
def_weight = &dv->dw[dv->totweight];
-
dv->totweight++;
- }
- /* set weight
value */
-
def_weight->weight = weight[i];
+ /* set
weight value */
+
def_weight->weight = weight[i];
+ }
}
}
}
@@ -1735,11 +1726,7 @@
for (i=0;
i<sData->total_points; i++) {
float normal[3];
normal_short_to_float_v3(normal, mvert[i].no);
- normalize_v3(normal);
-
- mvert[i].co[0] +=
normal[0]*wPoint[i].height;
- mvert[i].co[1] +=
normal[1]*wPoint[i].height;
- mvert[i].co[2] +=
normal[2]*wPoint[i].height;
+
madd_v3_v3fl(mvert[i].co, normal, wPoint[i].height);
}
CDDM_calc_normals(result);
}
Property changes on:
branches/bmesh/blender/source/blender/editors/space_outliner
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42290
+ /branches/soc-2011-pepper/source/blender/editors/space_outliner:36831-38987
/trunk/blender/source/blender/editors/space_outliner:31524-42292
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
