Commit: 7b8622457ba06b60320bb2e3c8e0a908b1b17d60
Author: Campbell Barton
Date: Mon Dec 23 10:53:46 2013 +1100
http://developer.blender.org/rB7b8622457ba06b60320bb2e3c8e0a908b1b17d60
Dupliverts: avoid calculating normals if not used
===================================================================
M source/blender/blenkernel/intern/anim.c
===================================================================
diff --git a/source/blender/blenkernel/intern/anim.c
b/source/blender/blenkernel/intern/anim.c
index 9226538..1624a02 100644
--- a/source/blender/blenkernel/intern/anim.c
+++ b/source/blender/blenkernel/intern/anim.c
@@ -943,6 +943,7 @@ static void vertex_dupli__mapFunc(void *userData, int
index, const float co[3],
static void vertex_duplilist(ListBase *lb, ID *id, Scene *scene, Object *par,
float par_space_mat[4][4], int persistent_id[MAX_DUPLI_RECUR],
int level, short flag)
{
+ const bool use_rotation = (par->transflag & OB_DUPLIROT) != 0;
Object *ob, *ob_iter;
Mesh *me = par->data;
Base *base = NULL;
@@ -1034,14 +1035,19 @@ static void vertex_duplilist(ListBase *lb, ID *id,
Scene *scene, Object *par, fl
if (ob->type != OB_MBALL) ob->flag |=
OB_DONE; /* doesnt render */
if (me->edit_btmesh) {
- dm->foreachMappedVert(dm,
vertex_dupli__mapFunc, (void *) &vdd, DM_FOREACH_USE_NORMAL);
+ dm->foreachMappedVert(dm,
vertex_dupli__mapFunc, (void *) &vdd,
+
use_rotation ? DM_FOREACH_USE_NORMAL : 0);
}
else {
+ const float *no_pt =
use_rotation ? no : NULL;
for (a = 0; a < totvert; a++) {
dm->getVertCo(dm, a,
vec);
- dm->getVertNo(dm, a,
no);
+
+ if (use_rotation) {
+
dm->getVertNo(dm, a, no);
+ }
-
vertex_dupli__mapFunc(&vdd, a, vec, no, NULL);
+
vertex_dupli__mapFunc(&vdd, a, vec, no_pt, NULL);
}
}
if (sce) {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
