[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28329] branches/render25: Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28321 :28328
Campbell Barton
ideasman42 at gmail.com
Wed Apr 21 18:35:11 CEST 2010
Revision: 28329
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28329
Author: campbellbarton
Date: 2010-04-21 18:35:10 +0200 (Wed, 21 Apr 2010)
Log Message:
-----------
Render Branch: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28321:28328
Modified Paths:
--------------
branches/render25/release/scripts/op/vertexpaint_dirt.py
branches/render25/release/scripts/ui/properties_physics_field.py
branches/render25/release/scripts/ui/space_view3d.py
branches/render25/source/blender/blenkernel/BKE_anim.h
branches/render25/source/blender/blenkernel/BKE_curve.h
branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
branches/render25/source/blender/blenkernel/intern/action.c
branches/render25/source/blender/blenkernel/intern/anim.c
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/boids.c
branches/render25/source/blender/blenkernel/intern/cdderivedmesh.c
branches/render25/source/blender/blenkernel/intern/constraint.c
branches/render25/source/blender/blenkernel/intern/curve.c
branches/render25/source/blender/blenkernel/intern/displist.c
branches/render25/source/blender/blenkernel/intern/effect.c
branches/render25/source/blender/blenkernel/intern/font.c
branches/render25/source/blender/blenkernel/intern/lattice.c
branches/render25/source/blender/blenkernel/intern/mesh.c
branches/render25/source/blender/blenkernel/intern/object.c
branches/render25/source/blender/blenkernel/intern/particle.c
branches/render25/source/blender/blenkernel/intern/particle_system.c
branches/render25/source/blender/blenkernel/intern/pointcache.c
branches/render25/source/blender/blenkernel/intern/sketch.c
branches/render25/source/blender/blenkernel/intern/softbody.c
branches/render25/source/blender/blenkernel/intern/subsurf_ccg.c
branches/render25/source/blender/blenlib/intern/graph.c
branches/render25/source/blender/blenlib/intern/math_geom.c
branches/render25/source/blender/editors/armature/editarmature.c
branches/render25/source/blender/editors/armature/editarmature_generate.c
branches/render25/source/blender/editors/armature/editarmature_sketch.c
branches/render25/source/blender/editors/armature/meshlaplacian.c
branches/render25/source/blender/editors/armature/reeb.c
branches/render25/source/blender/editors/curve/editcurve.c
branches/render25/source/blender/editors/mesh/editmesh_add.c
branches/render25/source/blender/editors/mesh/editmesh_lib.c
branches/render25/source/blender/editors/mesh/editmesh_mods.c
branches/render25/source/blender/editors/mesh/editmesh_tools.c
branches/render25/source/blender/editors/mesh/meshtools.c
branches/render25/source/blender/editors/object/object_hook.c
branches/render25/source/blender/editors/physics/particle_edit.c
branches/render25/source/blender/editors/sculpt_paint/paint_image.c
branches/render25/source/blender/editors/sculpt_paint/sculpt.c
branches/render25/source/blender/editors/space_view3d/drawarmature.c
branches/render25/source/blender/editors/space_view3d/drawobject.c
branches/render25/source/blender/editors/space_view3d/view3d_buttons.c
branches/render25/source/blender/editors/space_view3d/view3d_edit.c
branches/render25/source/blender/editors/space_view3d/view3d_snap.c
branches/render25/source/blender/editors/space_view3d/view3d_view.c
branches/render25/source/blender/editors/transform/transform.c
branches/render25/source/blender/editors/transform/transform_constraints.c
branches/render25/source/blender/editors/transform/transform_generics.c
branches/render25/source/blender/editors/transform/transform_manipulator.c
branches/render25/source/blender/editors/transform/transform_orientations.c
branches/render25/source/blender/editors/transform/transform_snap.c
branches/render25/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/render25/source/blender/makesdna/DNA_curve_types.h
branches/render25/source/blender/makesdna/DNA_object_force.h
branches/render25/source/blender/makesrna/intern/rna_object_force.c
branches/render25/source/blender/modifiers/intern/MOD_array.c
branches/render25/source/blender/modifiers/intern/MOD_cast.c
branches/render25/source/blender/modifiers/intern/MOD_explode.c
branches/render25/source/blender/modifiers/intern/MOD_smooth.c
branches/render25/source/blender/render/intern/source/volumetric.c
Modified: branches/render25/release/scripts/op/vertexpaint_dirt.py
===================================================================
--- branches/render25/release/scripts/op/vertexpaint_dirt.py 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/release/scripts/op/vertexpaint_dirt.py 2010-04-21 16:35:10 UTC (rev 28329)
@@ -58,17 +58,22 @@
con[e.verts[0]].append(e.verts[1])
con[e.verts[1]].append(e.verts[0])
- for v in me.verts:
+ for i, v in enumerate(me.verts):
vec = Vector()
no = v.normal
co = v.co
# get the direction of the vectors between the vertex and it's connected vertices
- for c in con[v.index]:
+ for c in con[i]:
vec += Vector(me.verts[c].co - co).normalize()
# normalize the vector by dividing by the number of connected verts
- vec /= len(con[v.index])
+ tot_con = len(con[i])
+
+ if tot_con == 0:
+ continue
+
+ vec /= tot_con
# angle is the acos of the dot product between vert and connected verts normals
ang = math.acos(no.dot(vec))
@@ -79,7 +84,7 @@
if not dirt_only:
ang = min(clamp_clean, ang)
- vert_tone[v.index] = ang
+ vert_tone[i] = ang
# blur tones
for i in range(blur_iterations):
@@ -146,7 +151,7 @@
class VertexPaintDirt(bpy.types.Operator):
- bl_idname = "mesh.vertex_paint_dirt"
+ bl_idname = "paint.vertex_color_dirt"
bl_label = "Dirty Vertex Colors"
bl_options = {'REGISTER', 'UNDO'}
@@ -171,7 +176,7 @@
print('Dirt calculated in %.6f' % (time.time() - t))
- return('FINISHED',)
+ return {'FINISHED'}
def register():
Modified: branches/render25/release/scripts/ui/properties_physics_field.py
===================================================================
--- branches/render25/release/scripts/ui/properties_physics_field.py 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/release/scripts/ui/properties_physics_field.py 2010-04-21 16:35:10 UTC (rev 28329)
@@ -72,6 +72,7 @@
col.prop(field, "guide_free")
col.prop(field, "falloff_power")
col.prop(field, "guide_path_add")
+ col.prop(field, "use_guide_path_weight")
if wide_ui:
col = split.column()
Modified: branches/render25/release/scripts/ui/space_view3d.py
===================================================================
--- branches/render25/release/scripts/ui/space_view3d.py 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/release/scripts/ui/space_view3d.py 2010-04-21 16:35:10 UTC (rev 28329)
@@ -850,6 +850,7 @@
layout = self.layout
layout.operator("paint.vertex_color_set")
+ layout.operator("paint.vertex_color_dirt")
class VIEW3D_MT_hook(bpy.types.Menu):
Modified: branches/render25/source/blender/blenkernel/BKE_anim.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_anim.h 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/source/blender/blenkernel/BKE_anim.h 2010-04-21 16:35:10 UTC (rev 28329)
@@ -63,7 +63,7 @@
void free_path(struct Path *path);
void calc_curvepath(struct Object *ob);
int interval_test(int min, int max, int p1, int cycl);
-int where_on_path(struct Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius);
+int where_on_path(struct Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius, float *weight);
/* ---------------------------------------------------- */
/* Dupli-Geometry */
Modified: branches/render25/source/blender/blenkernel/BKE_curve.h
===================================================================
--- branches/render25/source/blender/blenkernel/BKE_curve.h 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/source/blender/blenkernel/BKE_curve.h 2010-04-21 16:35:10 UTC (rev 28329)
@@ -72,7 +72,7 @@
void makeknots( struct Nurb *nu, short uv);
void makeNurbfaces(struct Nurb *nu, float *coord_array, int rowstride);
-void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, int resolu, int stride);
+void makeNurbcurve(struct Nurb *nu, float *coord_array, float *tilt_array, float *radius_array, float *weight_array, int resolu, int stride);
void forward_diff_bezier(float q0, float q1, float q2, float q3, float *p, int it, int stride);
float *make_orco_curve(struct Scene *scene, struct Object *ob);
float *make_orco_surf( struct Object *ob);
Modified: branches/render25/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/DerivedMesh.c 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/source/blender/blenkernel/intern/DerivedMesh.c 2010-04-21 16:35:10 UTC (rev 28329)
@@ -583,14 +583,14 @@
{
if (vertexCos) {
VECCOPY(cent, vertexCos[(int) efa->v1->tmp.l]);
- add_v3_v3v3(cent, cent, vertexCos[(int) efa->v2->tmp.l]);
- add_v3_v3v3(cent, cent, vertexCos[(int) efa->v3->tmp.l]);
- if (efa->v4) add_v3_v3v3(cent, cent, vertexCos[(int) efa->v4->tmp.l]);
+ add_v3_v3(cent, vertexCos[(int) efa->v2->tmp.l]);
+ add_v3_v3(cent, vertexCos[(int) efa->v3->tmp.l]);
+ if (efa->v4) add_v3_v3(cent, vertexCos[(int) efa->v4->tmp.l]);
} else {
VECCOPY(cent, efa->v1->co);
- add_v3_v3v3(cent, cent, efa->v2->co);
- add_v3_v3v3(cent, cent, efa->v3->co);
- if (efa->v4) add_v3_v3v3(cent, cent, efa->v4->co);
+ add_v3_v3(cent, efa->v2->co);
+ add_v3_v3(cent, efa->v3->co);
+ if (efa->v4) add_v3_v3(cent, efa->v4->co);
}
if (efa->v4) {
@@ -1369,15 +1369,15 @@
float *v4 = vertexCos[(int) efa->v4->tmp.l];
normal_quad_v3( no,v1, v2, v3, v4);
- add_v3_v3v3(emdm->vertexNos[(int) efa->v4->tmp.l], emdm->vertexNos[(int) efa->v4->tmp.l], no);
+ add_v3_v3(emdm->vertexNos[(int) efa->v4->tmp.l], no);
}
else {
normal_tri_v3( no,v1, v2, v3);
}
- add_v3_v3v3(emdm->vertexNos[(int) efa->v1->tmp.l], emdm->vertexNos[(int) efa->v1->tmp.l], no);
- add_v3_v3v3(emdm->vertexNos[(int) efa->v2->tmp.l], emdm->vertexNos[(int) efa->v2->tmp.l], no);
- add_v3_v3v3(emdm->vertexNos[(int) efa->v3->tmp.l], emdm->vertexNos[(int) efa->v3->tmp.l], no);
+ add_v3_v3(emdm->vertexNos[(int) efa->v1->tmp.l], no);
+ add_v3_v3(emdm->vertexNos[(int) efa->v2->tmp.l], no);
+ add_v3_v3(emdm->vertexNos[(int) efa->v3->tmp.l], no);
}
for(i=0, eve= em->verts.first; eve; i++, eve=eve->next) {
Modified: branches/render25/source/blender/blenkernel/intern/action.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/action.c 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/source/blender/blenkernel/intern/action.c 2010-04-21 16:35:10 UTC (rev 28329)
@@ -1251,12 +1251,12 @@
/* if blending, we only add with factor scrweight */
mul_v3_fl(vec, srcweight);
- add_v3_v3v3(dst->cyclic_offset, dst->cyclic_offset, vec);
+ add_v3_v3(dst->cyclic_offset, vec);
}
}
}
- add_v3_v3v3(dst->cyclic_offset, dst->cyclic_offset, src->cyclic_offset);
+ add_v3_v3(dst->cyclic_offset, src->cyclic_offset);
}
/* added "sizecorr" here, to allow armatures to be scaled and still have striding.
@@ -1616,7 +1616,7 @@
}
else if(blocktype==ID_AR) {
/* apply stride offset to object */
- add_v3_v3v3(ob->obmat[3], ob->obmat[3], ob->pose->stride_offset);
+ add_v3_v3(ob->obmat[3], ob->pose->stride_offset);
}
/* free */
Modified: branches/render25/source/blender/blenkernel/intern/anim.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/anim.c 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/source/blender/blenkernel/intern/anim.c 2010-04-21 16:35:10 UTC (rev 28329)
@@ -460,6 +460,7 @@
interp_v3_v3v3(pp->vec, bevp->vec, bevpn->vec, fac2);
pp->vec[3]= fac1*bevp->alfa + fac2*bevpn->alfa;
pp->radius= fac1*bevp->radius + fac2*bevpn->radius;
+ pp->weight= fac1*bevp->weight + fac2*bevpn->weight;
interp_qt_qtqt(pp->quat, bevp->quat, bevpn->quat, fac2);
normalize_qt(pp->quat);
@@ -491,7 +492,7 @@
* - *vec needs FOUR items!
* - ctime is normalized range <0-1>
*/
-int where_on_path(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius) /* returns OK */
+int where_on_path(Object *ob, float ctime, float *vec, float *dir, float *quat, float *radius, float *weight) /* returns OK */
{
Curve *cu;
Nurb *nu;
@@ -587,6 +588,9 @@
if(radius)
*radius= data[0]*p0->radius + data[1]*p1->radius + data[2]*p2->radius + data[3]*p3->radius;
+ if(weight)
+ *weight= data[0]*p0->weight + data[1]*p1->weight + data[2]*p2->weight + data[3]*p3->weight;
+
return 1;
}
@@ -726,7 +730,7 @@
VECCOPY(vec, co);
mul_m4_v3(vdd->pmat, vec);
sub_v3_v3v3(vec, vec, vdd->pmat[3]);
- add_v3_v3v3(vec, vec, vdd->obmat[3]);
+ add_v3_v3(vec, vdd->obmat[3]);
copy_m4_m4(obmat, vdd->obmat);
VECCOPY(obmat[3], vec);
@@ -986,7 +990,7 @@
mul_m4_v3(pmat, cent);
sub_v3_v3v3(cent, cent, pmat[3]);
- add_v3_v3v3(cent, cent, ob__obmat[3]);
+ add_v3_v3(cent, ob__obmat[3]);
copy_m4_m4(obmat, ob__obmat);
Modified: branches/render25/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/armature.c 2010-04-21 16:22:37 UTC (rev 28328)
+++ branches/render25/source/blender/blenkernel/intern/armature.c 2010-04-21 16:35:10 UTC (rev 28329)
@@ -852,7 +852,7 @@
// Make this a delta from the base position
sub_v3_v3v3(cop, cop, co);
cop[0]*=fac; cop[1]*=fac; cop[2]*=fac;
- add_v3_v3v3(vec, vec, cop);
+ add_v3_v3(vec, cop);
if(mat)
pchan_deform_mat_add(pchan, fac, bbonemat, mat);
@@ -1108,7 +1108,7 @@
mul_v3m3_dq( dco, (defMats)? summat: NULL,dq);
sub_v3_v3v3(dco, dco, co);
mul_v3_fl(dco, armature_weight);
- add_v3_v3v3(co, co, dco);
+ add_v3_v3(co, dco);
}
else
mul_v3m3_dq( co, (defMats)? summat: NULL,dq);
@@ -1941,7 +1941,7 @@
}
/* tail endpoint */
- if ( where_on_path(ikData->tar, tree->points[index], vec, dir, NULL, &rad) ) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list