blender
/
blender
129
397
Fork 571
Code Issues 6.2k Pull Requests 749 Projects 19 Wiki Activity

Fix for missing update changing VFont.filepath 

Changing the filepath wouldn't reload the font even after calling scene.update().
This commit is contained in:
Campbell Barton 2016-03-05 17:40:33 +11:00
parent 4e500101a7
commit 40b748d40f
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2586,7 +2586,18 @@ static void dag_id_flush_update(Main *bmain, Scene *sce, ID *id)
}
}
}
else if (idtype == ID_VF) {
for (obt = bmain->object.first; obt; obt = obt->id.next) {
if (obt->type == OB_FONT) {
Curve *cu = obt->data;
if (ELEM((struct VFont *)id, CURVE_VFONT_ANY(cu))) {
obt->recalc |= OB_RECALC_DATA;
lib_id_recalc_data_tag(bmain, &obt->id);
}
}
}
}
/* set flags based on textures - can influence depgraph via modifiers */
if (idtype == ID_TE) {
for (obt = bmain->object.first; obt; obt = obt->id.next) {
@ -2953,18 +2964,6 @@ void DAG_id_tag_update_ex(Main *bmain, ID *id, short flag)
}
}
}
else if (idtype == ID_VF) {
/* this is weak still, should be done delayed as well */
for (ob = bmain->object.first; ob; ob = ob->id.next) {
if (ob->type == OB_FONT) {
Curve *cu = ob->data;
if (ELEM((struct VFont *)id, cu->vfont, cu->vfontb, cu->vfonti, cu->vfontbi)) {
ob->recalc |= (flag & OB_RECALC_ALL);
}
}
}
}
else {
/* disable because this is called on various ID types automatically.
* where printing warning is not useful. for now just ignore */

3
source/blender/makesdna/DNA_curve_types.h
View File

@ -268,6 +268,9 @@ typedef struct Curve {
} Curve;
#define CURVE_VFONT_ANY(cu) \
((cu)->vfont), ((cu)->vfontb), ((cu)->vfonti), ((cu)->vfontbi)
/* **************** CURVE ********************* */
/* Curve.texflag */