Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2018-04-19 16:22:30 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2018-04-19 16:22:30 +0300
commit733fd3eabd840a1bc60f5ec8960330dca3cbc347 (patch)
tree078f1c75f3b50d5515713f18c4eeba53bdfd3fce /source/blender/makesrna/intern/rna_layer.c
parent8a2f0058aeab48e837561719a5dda27985d99ee5 (diff)
Workbench: removed per collection object color
Will be part of the collection manager where per collection the ob->col can be set. This currently depends on DepsGraph + CollectionManager. I removed it for now so the code won't influence development
Diffstat (limited to 'source/blender/makesrna/intern/rna_layer.c')
-rw-r--r--source/blender/makesrna/intern/rna_layer.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_layer.c b/source/blender/makesrna/intern/rna_layer.c
index 4ccf5d8bc33..da58c36dc12 100644
--- a/source/blender/makesrna/intern/rna_layer.c
+++ b/source/blender/makesrna/intern/rna_layer.c
@@ -360,10 +360,6 @@ RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(ssao_attenuation)
RNA_LAYER_ENGINE_CLAY_GET_SET_FLOAT(hair_brightness_randomness)
#endif /* WITH_CLAY_ENGINE */
-/* workbench engine */
-/* LayerCollection settings. */
-RNA_LAYER_ENGINE_WORKBENCH_GET_SET_FLOAT_ARRAY(object_color, 3)
-
/* eevee engine */
/* ViewLayer settings. */
RNA_LAYER_ENGINE_EEVEE_GET_SET_BOOL(gtao_enable)
@@ -1676,14 +1672,6 @@ static void rna_def_layer_collection_engine_settings_workbench(BlenderRNA *brna)
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", PROP_FLOAT, PROP_COLOR);
- RNA_def_property_array(prop, 3);
- RNA_def_property_float_funcs(prop, "rna_LayerEngineSettings_Workbench_object_color_get",
- "rna_LayerEngineSettings_Workbench_object_color_set", NULL);
- RNA_def_property_ui_text(prop, "Collection Color", "Color for Drawing Objects in this Collection");
- RNA_def_property_flag(prop, PROP_CONTEXT_UPDATE);
- RNA_def_property_update(prop, 0, "rna_LayerCollectionEngineSettings_update");
}
static void rna_def_layer_collection_mode_settings_object(BlenderRNA *brna)