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_space.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_space.c')
-rw-r--r--source/blender/makesrna/intern/rna_space.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 1937bb34a5d..7d121f76016 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -189,12 +189,6 @@ const EnumPropertyItem rna_enum_viewport_lighting_items[] = {
{0, NULL, 0, NULL, NULL}
};
-const EnumPropertyItem rna_enum_viewport_object_color_type_items[] = {
- {V3D_OBJECT_COLOR_COLLECTION, "COLLECTION", 0, "Collection", ""},
- {V3D_OBJECT_COLOR_OBJECT, "OBJECT", 0, "Object", ""},
- {0, NULL, 0, NULL, NULL}
-};
-
const EnumPropertyItem rna_enum_clip_editor_mode_items[] = {
{SC_MODE_TRACKING, "TRACKING", ICON_ANIM_DATA, "Tracking", "Show tracking and solving tools"},
{SC_MODE_MASKEDIT, "MASK", ICON_MOD_MASK, "Mask", "Show mask editing tools"},
@@ -2336,12 +2330,6 @@ static void rna_def_space_view3d(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Viewport Lighting (Solid)", "Lighting Method for Solid Viewport Shading");
RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
- prop = RNA_def_property(srna, "viewport_object_color_type", PROP_ENUM, PROP_NONE);
- RNA_def_property_enum_sdna(prop, NULL, "drawtype_object_color");
- RNA_def_property_enum_items(prop, rna_enum_viewport_object_color_type_items);
- RNA_def_property_ui_text(prop, "Viewport Color", "Type of Color Distribution for Objects");
- RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, "rna_SpaceView3D_viewport_shade_update");
-
prop = RNA_def_property(srna, "viewport_shade_texture", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_sdna(prop, NULL, "drawtype_texture");
RNA_def_property_enum_items(prop, rna_enum_viewport_lighting_items);