archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Fix T53410: 3D Text always recalculated

Browse Source
This commit is contained in:
Campbell Barton
2017-11-30 17:08:37 +11:00
parent 099a99dbc9
commit df7b9fa2ee
1 changed files with 13 additions and 2 deletions
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"
@@ -2267,8 +2268,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;