diff options
| -rw-r--r-- | source/blender/draw/intern/draw_common.c | 7 | ||||
| -rw-r--r-- | tests/performance/api/environment.py | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/draw/intern/draw_common.c b/source/blender/draw/intern/draw_common.c index 9151c0bd68b..2cbea2ae6d5 100644 --- a/source/blender/draw/intern/draw_common.c +++ b/source/blender/draw/intern/draw_common.c @@ -295,9 +295,10 @@ int DRW_object_wire_theme_get(Object *ob, ViewLayer *view_layer, float **r_color { const DRWContextState *draw_ctx = DRW_context_state_get(); const bool is_edit = (draw_ctx->object_mode & OB_MODE_EDIT) && (ob->mode & OB_MODE_EDIT); - const bool active = (ob->base_flag & BASE_FROM_DUPLI) ? - (DRW_object_get_dupli_parent(ob) == view_layer->basact->object) : - (view_layer->basact && view_layer->basact->object == ob); + const bool active = view_layer->basact && + ((ob->base_flag & BASE_FROM_DUPLI) ? + (DRW_object_get_dupli_parent(ob) == view_layer->basact->object) : + (view_layer->basact->object == ob)); /* confusing logic here, there are 2 methods of setting the color * 'colortab[colindex]' and 'theme_id', colindex overrides theme_id. diff --git a/tests/performance/api/environment.py b/tests/performance/api/environment.py index eec92cc7b6b..235a1805ba9 100644 --- a/tests/performance/api/environment.py +++ b/tests/performance/api/environment.py @@ -235,7 +235,7 @@ class TestEnvironment: output_prefix = 'TEST_OUTPUT: ' expression = (f'import sys, pickle, base64\n' - f'sys.path.append("{package_path}")\n' + f'sys.path.append(r"{package_path}")\n' f'import {modulename}\n' f'args = pickle.loads(base64.b64decode({args}))\n' f'result = {modulename}.{functionname}(args)\n' |