diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 13:44:37 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2018-04-19 13:44:37 +0300 |
| commit | b0d5e74fcce929c649391a9f694ee39649a84e1c (patch) | |
| tree | 19a9d2281e4c32f8edbe50f19007225fe8f79839 /source/blender/makesrna/intern/rna_layer.c | |
| parent | a8db1efbcf1513f7bb912c98ea9c1b7d3b333727 (diff) | |
Workbench: drawtype object color from collection to v3d
Now every 3d view can have its own solid draw color setting
Diffstat (limited to 'source/blender/makesrna/intern/rna_layer.c')
| -rw-r--r-- | source/blender/makesrna/intern/rna_layer.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c index 245f368ce30..4ccf5d8bc33 100644 --- a/source/blender/makesrna/intern/rna_layer.c +++ b/source/blender/makesrna/intern/rna_layer.c @@ -363,7 +363,6 @@ RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(hair_brightness_randomness) /* workbench engine */ /* LayerCollection settings. */ RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT_ARRAY(object_color, 3) -RNA_LAYER_ENGINE_WORKBENCH_GET_SET_INT(object_color_type) /* eevee engine */ /* ViewLayer settings. */ @@ -1673,24 +1672,11 @@ static void rna_def_layer_collection_engine_settings_workbench(BlenderRNA *brna) StructRNA *srna; PropertyRNA *prop; - static const EnumPropertyItem object_color_type_items[] = { - {V3D_OBJECT_COLOR_COLLECTION, "COLLECTION", 0, "Collection", ""}, - {V3D_OBJECT_COLOR_OBJECT, "OBJECT", 0, "Object", ""}, - {0, NULL, 0, NULL, NULL} - }; - srna = RNA_def_struct(brna, "LayerCollectionEngineSettingsWorkbench", "LayerCollectionSettings"); RNA_def_struct_ui_text(srna, "Collections Workbench Engine Settings", "Workbench specific settings for this collection"); RNA_define_verify_sdna(0); /* not in sdna */ - prop = RNA_def_property(srna, "object_color_type", PROP_ENUM, PROP_COLOR); - RNA_def_property_enum_funcs(prop, "rna_LayerEngineSettings_Workbench_object_color_type_get", "rna_LayerEngineSettings_Workbench_object_color_type_set", NULL); - RNA_def_property_enum_items(prop, object_color_type_items); - RNA_def_property_ui_text(prop, "Object Color", "Way colors are given to the Object"); - RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE); - RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update"); - prop = RNA_def_property(srna, "object_color", PROP_FLOAT, PROP_COLOR); RNA_def_property_array(prop, 3); RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_object_color_get", |