diff options
author | mano-wii <germano.costa@ig.com.br> | 2018-11-19 15:28:31 +0300 |
---|---|---|
committer | mano-wii <germano.costa@ig.com.br> | 2018-11-19 15:28:31 +0300 |
commit | 51711fdcaa48e37e1d6cf3dfb27d8d234786bd1b (patch) | |
tree | c293147d9e26d11cfe71bc01723c624f03e25c75 /source/blender/blenkernel/intern/displist.c | |
parent | 3f59bdc1bd0a380d464896e982204ba48c50e3b1 (diff) |
Revert "BKE object: Correct bound box of bezier curve objects not matching the object viewed."
This reverts commit 24677cf77bbd97827bb5789bc1e4d883732a59da.
Diffstat (limited to 'source/blender/blenkernel/intern/displist.c')
-rw-r--r-- | source/blender/blenkernel/intern/displist.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/source/blender/blenkernel/intern/displist.c b/source/blender/blenkernel/intern/displist.c index 3339118f8e3..8d49521831f 100644 --- a/source/blender/blenkernel/intern/displist.c +++ b/source/blender/blenkernel/intern/displist.c @@ -65,13 +65,10 @@ #include "BKE_modifier.h" #include "BLI_sys_types.h" // for intptr_t support -#include "BLI_threads.h" #include "DEG_depsgraph.h" #include "DEG_depsgraph_query.h" -static ThreadRWMutex cache_rwlock = BLI_RWLOCK_INITIALIZER; - static void boundbox_displist_object(Object *ob); void BKE_displist_elem_free(DispList *dl) @@ -1801,7 +1798,6 @@ void BKE_displist_make_curveTypes(Depsgraph *depsgraph, Scene *scene, Object *ob if (!ELEM(ob->type, OB_SURF, OB_CURVE, OB_FONT)) return; - BLI_rw_mutex_lock(&cache_rwlock, THREAD_LOCK_WRITE); BKE_object_free_derived_caches(ob); if (!ob->runtime.curve_cache) { @@ -1813,7 +1809,6 @@ void BKE_displist_make_curveTypes(Depsgraph *depsgraph, Scene *scene, Object *ob do_makeDispListCurveTypes(depsgraph, scene, ob, dispbase, &ob->runtime.mesh_eval, 0, for_orco, 0); boundbox_displist_object(ob); - BLI_rw_mutex_unlock(&cache_rwlock); } void BKE_displist_make_curveTypes_forRender( @@ -1887,16 +1882,3 @@ static void boundbox_displist_object(Object *ob) } } } - -BoundBox *BKE_displist_boundbox_get(struct Object *ob) -{ - BLI_rw_mutex_lock(&cache_rwlock, THREAD_LOCK_READ); - if ((ob->bb == NULL) || (ob->bb->flag & BOUNDBOX_DIRTY)) { - /* This should always only be called with evaluated objects, but currently RNA is a problem here... */ - if (ob->runtime.curve_cache != NULL) { - boundbox_displist_object(ob); - } - } - BLI_rw_mutex_unlock(&cache_rwlock); - return ob->bb; -} |