forked from bartvdbraak/blender
Merge branch 'blender-v3.0-release'
This commit is contained in:
commit
4648c4990c
@ -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 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 is_edit = (draw_ctx->object_mode & OB_MODE_EDIT) && (ob->mode & OB_MODE_EDIT);
|
||||||
const bool active = (ob->base_flag & BASE_FROM_DUPLI) ?
|
const bool active = view_layer->basact &&
|
||||||
(DRW_object_get_dupli_parent(ob) == view_layer->basact->object) :
|
((ob->base_flag & BASE_FROM_DUPLI) ?
|
||||||
(view_layer->basact && view_layer->basact->object == ob);
|
(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
|
/* confusing logic here, there are 2 methods of setting the color
|
||||||
* 'colortab[colindex]' and 'theme_id', colindex overrides theme_id.
|
* 'colortab[colindex]' and 'theme_id', colindex overrides theme_id.
|
||||||
|
@ -235,7 +235,7 @@ class TestEnvironment:
|
|||||||
output_prefix = 'TEST_OUTPUT: '
|
output_prefix = 'TEST_OUTPUT: '
|
||||||
|
|
||||||
expression = (f'import sys, pickle, base64\n'
|
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'import {modulename}\n'
|
||||||
f'args = pickle.loads(base64.b64decode({args}))\n'
|
f'args = pickle.loads(base64.b64decode({args}))\n'
|
||||||
f'result = {modulename}.{functionname}(args)\n'
|
f'result = {modulename}.{functionname}(args)\n'
|
||||||
|
Loading…
Reference in New Issue
Block a user