Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-07-01 13:39:00 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-07-01 13:42:42 +0300
commit6b9c41719bdf7514b9f9ca88e8fb09d3270cf1f2 (patch)
tree2d85b857879e3f322425774806eeeecdee8f4459 /source/blender/blenkernel/intern/curve.c
parent67fc4f4bedded86a04d2bf98ca1642a12d9662b3 (diff)
Fix T65798: Incorrect auto-tex space for Curves
There are several aspects to the fix: - Always calculate bounding box for meshes and curves from dependency graph evaluation function. There is a reason why mesh was tagged for geometry update, so can not be spare here in attempts to avoid calculation. - Remove texture space evaluation from RNA accessor. Such data is to be evaluated by a dependency graph. Don't see a reason to be different here: we never force evaluation of any kind from RNA. - Copy bounding box and texture space to original object for active dependency graph. This matches object-level bounding box and allows to remove bounding box evaluation from RNA.
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r--source/blender/blenkernel/intern/curve.c15
1 files changed, 13 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c
index 5945fa4bf33..0fb6b8005d4 100644
--- a/source/blender/blenkernel/intern/curve.c
+++ b/source/blender/blenkernel/intern/curve.c
@@ -54,6 +54,7 @@
#include "BKE_material.h"
#include "DEG_depsgraph.h"
+#include "DEG_depsgraph_query.h"
#include "CLG_log.h"
@@ -5431,8 +5432,18 @@ void BKE_curve_rect_from_textbox(const struct Curve *cu,
void BKE_curve_eval_geometry(Depsgraph *depsgraph, Curve *curve)
{
DEG_debug_print_eval(depsgraph, __func__, curve->id.name, curve);
- if (curve->bb == NULL || (curve->bb->flag & BOUNDBOX_DIRTY)) {
- BKE_curve_texspace_calc(curve);
+ BKE_curve_texspace_calc(curve);
+ if (DEG_is_active(depsgraph)) {
+ Curve *curve_orig = (Curve *)DEG_get_original_id(&curve->id);
+ BoundBox *bb = curve->bb;
+ if (bb != NULL) {
+ if (curve_orig->bb == NULL) {
+ curve_orig->bb = MEM_mallocN(sizeof(*curve_orig->bb), __func__);
+ }
+ *curve_orig->bb = *bb;
+ copy_v3_v3(curve_orig->loc, curve->loc);
+ copy_v3_v3(curve_orig->size, curve->size);
+ }
}
}