blender
/
blender
128
396
Fork 568
Code Issues 6.2k Pull Requests 753 Projects 19 Wiki Activity

Fix T53410: 3D Text always recalculated

This commit is contained in:
Campbell Barton 2017-11-30 17:08:37 +11:00 committed by Bastien Montagne
parent 7153cee305
commit 480b0b5dfc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/blender/blenkernel/intern/depsgraph.c
View File

@ -67,6 +67,7 @@
#include "BKE_action.h"
#include "BKE_DerivedMesh.h"
#include "BKE_collision.h"
#include "BKE_curve.h"
#include "BKE_effect.h"
#include "BKE_fcurve.h"
#include "BKE_global.h"
@ -2266,8 +2267,18 @@ static void dag_object_time_update_flags(Main *bmain, Scene *scene, Object *ob)
break;
case OB_FONT:
cu = ob->data;
if (BLI_listbase_is_empty(&cu->nurb) && cu->str && cu->vfont)
ob->recalc |= OB_RECALC_DATA;
if (cu->str && cu->vfont) {
/* Can be in the curve-cache or the curve. */
if (ob->curve_cache && !BLI_listbase_is_empty(&ob->curve_cache->disp)) {
/* pass */
}
else if (!BLI_listbase_is_empty(&cu->nurb)) {
/* pass */
}
else {
ob->recalc |= OB_RECALC_DATA;
}
}
break;
case OB_LATTICE:
lt = ob->data;