Page MenuHome
Differential D2927 Diff 9589 source/blender/makesrna/intern/rna_workspace.c

Changeset View

Standalone View

View Options

source/blender/makesrna/intern/rna_workspace.c

Show First 20 Lines • Show All 89 Lines • ▼ Show 20 Lines
} }
static PointerRNA rna_workspace_transform_orientations_item_get(CollectionPropertyIterator *iter) static PointerRNA rna_workspace_transform_orientations_item_get(CollectionPropertyIterator *iter)
{ {
TransformOrientation *transform_orientation = rna_iterator_listbase_get(iter); TransformOrientation *transform_orientation = rna_iterator_listbase_get(iter);
return rna_pointer_inherit_refine(&iter->parent, &RNA_TransformOrientation, transform_orientation); return rna_pointer_inherit_refine(&iter->parent, &RNA_TransformOrientation, transform_orientation);
} }
static PointerRNA rna_workspace_render_layer_get(PointerRNA *ptr) static PointerRNA rna_workspace_view_layer_get(PointerRNA *ptr)
{ {
WorkSpace *workspace = ptr->data; WorkSpace *workspace = ptr->data;
SceneLayer *render_layer = BKE_workspace_render_layer_get(workspace); ViewLayer *view_layer = BKE_workspace_view_layer_get(workspace);
/* XXX hmrf... lookup in getter... but how could we avoid it? */ /* XXX hmrf... lookup in getter... but how could we avoid it? */
for (Scene *scene = G.main->scene.first; scene; scene = scene->id.next) { for (Scene *scene = G.main->scene.first; scene; scene = scene->id.next) {
if (BLI_findindex(&scene->render_layers, render_layer) != -1) { if (BLI_findindex(&scene->view_layers, view_layer) != -1) {
PointerRNA scene_ptr; PointerRNA scene_ptr;
RNA_id_pointer_create(&scene->id, &scene_ptr); RNA_id_pointer_create(&scene->id, &scene_ptr);
return rna_pointer_inherit_refine(&scene_ptr, &RNA_SceneLayer, render_layer); return rna_pointer_inherit_refine(&scene_ptr, &RNA_ViewLayer, view_layer);
} }
} }
return PointerRNA_NULL; return PointerRNA_NULL;
} }
static void rna_workspace_render_layer_set(PointerRNA *ptr, PointerRNA value) static void rna_workspace_view_layer_set(PointerRNA *ptr, PointerRNA value)
{ {
WorkSpace *workspace = ptr->data; WorkSpace *workspace = ptr->data;
BKE_workspace_render_layer_set(workspace, value.data); BKE_workspace_view_layer_set(workspace, value.data);
} }
#else /* RNA_RUNTIME */ #else /* RNA_RUNTIME */
static void rna_def_workspace(BlenderRNA *brna) static void rna_def_workspace(BlenderRNA *brna)
{ {
StructRNA *srna; StructRNA *srna;
PropertyRNA *prop; PropertyRNA *prop;
Show All 35 Lines#endif
prop = RNA_def_property(srna, "orientations", PROP_COLLECTION, PROP_NONE); prop = RNA_def_property(srna, "orientations", PROP_COLLECTION, PROP_NONE);
RNA_def_property_collection_sdna(prop, NULL, "transform_orientations", NULL); RNA_def_property_collection_sdna(prop, NULL, "transform_orientations", NULL);
RNA_def_property_struct_type(prop, "TransformOrientation"); RNA_def_property_struct_type(prop, "TransformOrientation");
RNA_def_property_collection_funcs(prop, "rna_workspace_transform_orientations_begin", NULL, NULL, RNA_def_property_collection_funcs(prop, "rna_workspace_transform_orientations_begin", NULL, NULL,
"rna_workspace_transform_orientations_item_get", NULL, NULL, NULL, NULL); "rna_workspace_transform_orientations_item_get", NULL, NULL, NULL, NULL);
RNA_def_property_ui_text(prop, "Transform Orientations", ""); RNA_def_property_ui_text(prop, "Transform Orientations", "");
prop = RNA_def_property(srna, "render_layer", PROP_POINTER, PROP_NONE); prop = RNA_def_property(srna, "view_layer", PROP_POINTER, PROP_NONE);
RNA_def_property_struct_type(prop, "SceneLayer"); RNA_def_property_struct_type(prop, "ViewLayer");
RNA_def_property_pointer_funcs(prop, "rna_workspace_render_layer_get", "rna_workspace_render_layer_set", RNA_def_property_pointer_funcs(prop, "rna_workspace_view_layer_get", "rna_workspace_view_layer_set",
NULL, NULL); NULL, NULL);
RNA_def_property_ui_text(prop, "Active Render Layer", "The active render layer used in this workspace"); RNA_def_property_ui_text(prop, "Active View Layer", "The active view layer used in this workspace");
RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL); RNA_def_property_flag(prop, PROP_EDITABLE | PROP_NEVER_NULL);
RNA_def_property_update(prop, NC_SCREEN | ND_LAYER, NULL); RNA_def_property_update(prop, NC_SCREEN | ND_LAYER, NULL);
/* View Render */ /* View Render */
prop = RNA_def_property(srna, "view_render", PROP_POINTER, PROP_NONE); prop = RNA_def_property(srna, "view_render", PROP_POINTER, PROP_NONE);
RNA_def_property_flag(prop, PROP_NEVER_NULL); RNA_def_property_flag(prop, PROP_NEVER_NULL);
RNA_def_property_struct_type(prop, "ViewRenderSettings"); RNA_def_property_struct_type(prop, "ViewRenderSettings");
RNA_def_property_ui_text(prop, "View Render", ""); RNA_def_property_ui_text(prop, "View Render", "");
Show All 35 Lines