diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-01 17:45:32 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2019-07-01 17:49:12 +0300 |
commit | 9197462e07a816f9cd3d99643c4b5fbbf07063c4 (patch) | |
tree | 9adf6d71eff66bec85d6a93c323004db030aa803 /source/blender/blenkernel/intern/curve.c | |
parent | 6b3e709febdffea05f139bd6fe4a54e5a351e8cc (diff) |
Revert "Fix T65798: Incorrect auto-tex space for Curves"
The fix broke a lot of Cycles regression tests. Reverting for now.
This reverts commit 6b9c41719bdf7514b9f9ca88e8fb09d3270cf1f2.
Diffstat (limited to 'source/blender/blenkernel/intern/curve.c')
-rw-r--r-- | source/blender/blenkernel/intern/curve.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/source/blender/blenkernel/intern/curve.c b/source/blender/blenkernel/intern/curve.c index 0fb6b8005d4..5945fa4bf33 100644 --- a/source/blender/blenkernel/intern/curve.c +++ b/source/blender/blenkernel/intern/curve.c @@ -54,7 +54,6 @@ #include "BKE_material.h" #include "DEG_depsgraph.h" -#include "DEG_depsgraph_query.h" #include "CLG_log.h" @@ -5432,18 +5431,8 @@ 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); - 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); - } + if (curve->bb == NULL || (curve->bb->flag & BOUNDBOX_DIRTY)) { + BKE_curve_texspace_calc(curve); } } |