Revision: 28382
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28382
Author: campbellbarton
Date: 2010-04-23 14:13:58 +0200 (Fri, 23 Apr 2010)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r28377:28381
Modified Paths:
--------------
branches/render25/source/blender/blenkernel/intern/armature.c
branches/render25/source/blender/blenkernel/intern/report.c
Modified: branches/render25/source/blender/blenkernel/intern/armature.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/armature.c
2010-04-23 12:11:56 UTC (rev 28381)
+++ branches/render25/source/blender/blenkernel/intern/armature.c
2010-04-23 12:13:58 UTC (rev 28382)
@@ -958,23 +958,26 @@
/* get the def_nr for the overall armature vertex group if present */
armature_def_nr= defgroup_name_index(target, defgrp_name);
-
+
+ if(ELEM(target->type, OB_MESH, OB_LATTICE)) {
+ numGroups = BLI_countlist(&target->defbase);
+
+ if(target->type==OB_MESH) {
+ Mesh *me= target->data;
+ dverts = me->dvert;
+ target_totvert = me->totvert;
+ }
+ else {
+ Lattice *lt= target->data;
+ dverts = lt->dvert;
+ if(dverts)
+ target_totvert = lt->pntsu*lt->pntsv*lt->pntsw;
+ }
+ }
+
/* get a vertex-deform-index to posechannel array */
if(deformflag & ARM_DEF_VGROUP) {
if(ELEM(target->type, OB_MESH, OB_LATTICE)) {
- numGroups = BLI_countlist(&target->defbase);
-
- if(target->type==OB_MESH) {
- Mesh *me= target->data;
- dverts = me->dvert;
- target_totvert = me->totvert;
- }
- else {
- Lattice *lt= target->data;
- dverts = lt->dvert;
- if(dverts)
- target_totvert =
lt->pntsu*lt->pntsv*lt->pntsw;
- }
/* if we have a DerivedMesh, only use dverts if it has
them */
if(dm)
if(dm->getVertData(dm, 0, CD_MDEFORMVERT))
Modified: branches/render25/source/blender/blenkernel/intern/report.c
===================================================================
--- branches/render25/source/blender/blenkernel/intern/report.c 2010-04-23
12:11:56 UTC (rev 28381)
+++ branches/render25/source/blender/blenkernel/intern/report.c 2010-04-23
12:13:58 UTC (rev 28382)
@@ -31,6 +31,7 @@
#include "BLI_dynstr.h"
#include "BKE_report.h"
+#include "BKE_global.h" /* G.background only */
#include <stdarg.h>
#include <stdio.h>
@@ -93,6 +94,10 @@
Report *report;
int len;
+ /* exception, print and return in background, no reason to store a list */
+ if(G.background)
+ reports= NULL;
+
if(!reports || ((reports->flag & RPT_PRINT) && (type >=
reports->printlevel))) {
printf("%s: %s\n", report_type_str(type), message);
fflush(stdout); /* this ensures the message is printed before a
crash */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
