[Bf-blender-cvs] [b365cc017ad] blender2.8: 3D Viewport: move overlay settings from collections to 3D viewport.
Brecht Van Lommel
noreply at git.blender.org
Sat May 5 16:02:34 CEST 2018
Commit: b365cc017adf3a8fb36006d6cb194d28be02e6d4
Author: Brecht Van Lommel
Date: Thu May 3 15:09:09 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBb365cc017adf3a8fb36006d6cb194d28be02e6d4
3D Viewport: move overlay settings from collections to 3D viewport.
For some we may add per object overrides, but for most we plan to keep them
strictly per viewport settings. Display settings from the mesh still need to
be moved here, only collections were done to remove that code.
===================================================================
M release/scripts/startup/bl_ui/properties_collection.py
M release/scripts/startup/bl_ui/space_view3d.py
M source/blender/blenkernel/BKE_layer.h
M source/blender/blenkernel/intern/layer.c
M source/blender/blenkernel/intern/scene.c
M source/blender/blenloader/intern/versioning_250.c
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/DRW_engine.h
M source/blender/draw/engines/clay/clay_engine.c
M source/blender/draw/engines/eevee/eevee_bloom.c
M source/blender/draw/engines/eevee/eevee_depth_of_field.c
M source/blender/draw/engines/eevee/eevee_lightprobes.c
M source/blender/draw/engines/eevee/eevee_lights.c
M source/blender/draw/engines/eevee/eevee_materials.c
M source/blender/draw/engines/eevee/eevee_motion_blur.c
M source/blender/draw/engines/eevee/eevee_occlusion.c
M source/blender/draw/engines/eevee/eevee_render.c
M source/blender/draw/engines/eevee/eevee_screen_raytrace.c
M source/blender/draw/engines/eevee/eevee_subsurface.c
M source/blender/draw/engines/eevee/eevee_temporal_sampling.c
M source/blender/draw/engines/eevee/eevee_volumes.c
M source/blender/draw/engines/workbench/workbench_materials.c
M source/blender/draw/intern/draw_manager.c
M source/blender/draw/modes/edit_curve_mode.c
M source/blender/draw/modes/edit_mesh_mode.c
M source/blender/draw/modes/object_mode.c
M source/blender/draw/modes/paint_vertex_mode.c
M source/blender/draw/modes/paint_weight_mode.c
M source/blender/makesdna/DNA_layer_types.h
M source/blender/makesdna/DNA_scene_types.h
M source/blender/makesdna/DNA_view3d_types.h
M source/blender/makesrna/intern/rna_layer.c
M source/blender/makesrna/intern/rna_mesh.c
M source/blender/makesrna/intern/rna_scene.c
M source/blender/makesrna/intern/rna_space.c
===================================================================
diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index 2d032e7f95d..80598632714 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -86,94 +86,9 @@ class COLLECTION_PT_clay_settings(CollectionButtonsPanel, Panel):
col.template_override_property(collection_props, scene_props, "hair_brightness_randomness")
-class COLLECTION_PT_object_mode_settings(CollectionButtonsPanel, Panel):
- bl_label = "Object Mode Settings"
-
- @classmethod
- def poll(cls, context):
- ob = context.object
- return ob and ob.mode == 'OBJECT'
-
- def draw(self, context):
- layout = self.layout
- scene_props = context.scene.collection_properties['ObjectMode']
- collection = get_collection_from_context(context)
- collection_props = collection.engine_overrides['ObjectMode']
-
- col = layout.column()
- col.template_override_property(collection_props, scene_props, "show_wire")
- col.template_override_property(collection_props, scene_props, "show_backface_culling")
-
-
-class COLLECTION_PT_edit_mode_settings(CollectionButtonsPanel, Panel):
- bl_label = "Edit Mode Settings"
-
- @classmethod
- def poll(cls, context):
- ob = context.object
- return ob and ob.mode == 'EDIT'
-
- def draw(self, context):
- layout = self.layout
- scene_props = context.scene.collection_properties['EditMode']
- collection = get_collection_from_context(context)
- collection_props = collection.engine_overrides['EditMode']
-
- col = layout.column()
- col.template_override_property(collection_props, scene_props, "show_occlude_wire")
- col.template_override_property(collection_props, scene_props, "backwire_opacity")
- col.template_override_property(collection_props, scene_props, "face_normals_show")
- col.template_override_property(collection_props, scene_props, "vert_normals_show")
- col.template_override_property(collection_props, scene_props, "loop_normals_show")
- col.template_override_property(collection_props, scene_props, "normals_length")
- col.template_override_property(collection_props, scene_props, "show_weight")
-
-
-class COLLECTION_PT_paint_weight_mode_settings(CollectionButtonsPanel, Panel):
- bl_label = "Weight Paint Mode Settings"
-
- @classmethod
- def poll(cls, context):
- ob = context.object
- return ob and ob.mode == 'WEIGHT_PAINT'
-
- def draw(self, context):
- layout = self.layout
- scene_props = context.scene.collection_properties['WeightPaintMode']
- collection = get_collection_from_context(context)
- collection_props = collection.engine_overrides['WeightPaintMode']
-
- col = layout.column()
- col.template_override_property(collection_props, scene_props, "use_shading")
- col.template_override_property(collection_props, scene_props, "use_wire")
-
-
-class COLLECTION_PT_paint_vertex_mode_settings(CollectionButtonsPanel, Panel):
- bl_label = "Vertex Paint Mode Settings"
-
- @classmethod
- def poll(cls, context):
- ob = context.object
- return ob and ob.mode == 'VERTEX_PAINT'
-
- def draw(self, context):
- layout = self.layout
- scene_props = context.scene.collection_properties['VertexPaintMode']
- collection = get_collection_from_context(context)
- collection_props = collection.engine_overrides['VertexPaintMode']
-
- col = layout.column()
- col.template_override_property(collection_props, scene_props, "use_shading")
- col.template_override_property(collection_props, scene_props, "use_wire")
-
-
classes = (
COLLECTION_PT_context_collection,
COLLECTION_PT_clay_settings,
- COLLECTION_PT_object_mode_settings,
- COLLECTION_PT_edit_mode_settings,
- COLLECTION_PT_paint_weight_mode_settings,
- COLLECTION_PT_paint_vertex_mode_settings,
)
if __name__ == "__main__": # only for live edit.
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 3a35990fd60..d73fdb2e750 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3555,7 +3555,7 @@ class VIEW3D_PT_shading(Panel):
col.separator()
col.row().prop(shading, "light", expand=True)
if shading.light == 'STUDIO':
- col.row().template_icon_view(shading, "studiolight")
+ col.row().template_icon_view(shading, "studio_light")
col.separator()
col.prop(shading, "show_shadows")
@@ -3592,23 +3592,13 @@ class VIEW3D_PT_overlay(Panel):
col.active = display_all
col.prop(overlay, "show_cursor")
- if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX'}:
- engine_type = {
- 'PAINT_WEIGHT': 'WeightPaintMode',
- 'PAINT_VERTEX': 'VertexPaintMode',
- }.get(context.mode)
- engine_props = scene.collection_properties[engine_type]
- col.prop(engine_props, "use_wire")
-
- if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
- col.prop(view, "show_mode_shade_override")
-
col = layout.column()
col.active = display_all
col.prop(overlay, "show_outline_selected")
col.prop(overlay, "show_all_objects_origin")
col.prop(overlay, "show_relationship_lines")
col.prop(overlay, "show_face_orientation")
+ col.prop(overlay, "show_backface_culling")
col = layout.column()
col.active = display_all
@@ -3630,6 +3620,32 @@ class VIEW3D_PT_overlay(Panel):
subsub.active = scene.unit_settings.system == 'NONE'
subsub.prop(overlay, "grid_subdivisions", text="Subdivisions")
+ if context.mode == 'EDIT_MESH':
+ col.separator()
+ col.label(text="Edit Mode:")
+
+ col.prop(overlay, "show_occlude_wire")
+
+ col.label(text="Normals:")
+ row = col.row(align=True)
+
+ row.prop(overlay, "show_vertex_normals", text="", icon='VERTEXSEL')
+ row.prop(overlay, "show_split_normals", text="", icon='LOOPSEL')
+ row.prop(overlay, "show_face_normals", text="", icon='FACESEL')
+
+ sub = row.row(align=True)
+ sub.active = overlay.show_vertex_normals or overlay.show_face_normals or overlay.show_split_normals
+ sub.prop(overlay, "normals_length", text="Size")
+
+ elif context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX', 'PAINT_TEXTURE'}:
+ col.separator()
+ col.label(text="Paint Mode:")
+
+ if context.mode in {'PAINT_WEIGHT', 'PAINT_VERTEX'}:
+ col.prop(overlay, "show_paint_wire")
+
+ col.prop(view, "show_mode_shade_override")
+
class VIEW3D_PT_quad_view(Panel):
bl_space_type = 'VIEW_3D'
@@ -3770,18 +3786,6 @@ class VIEW3D_PT_view3d_meshdisplay(Panel):
col = layout.column()
- col.separator()
- col.label(text="Normals:")
- row = col.row(align=True)
-
- row.prop(mesh, "show_normal_vertex", text="", icon='VERTEXSEL')
- row.prop(mesh, "show_normal_loop", text="", icon='LOOPSEL')
- row.prop(mesh, "show_normal_face", text="", icon='FACESEL')
-
- sub = row.row(align=True)
- sub.active = mesh.show_normal_vertex or mesh.show_normal_face or mesh.show_normal_loop
- sub.prop(scene.tool_settings, "normal_size", text="Size")
-
col.separator()
split = layout.split()
col = split.column()
diff --git a/source/blender/blenkernel/BKE_layer.h b/source/blender/blenkernel/BKE_layer.h
index 27e3d32a510..5c84dbf160e 100644
--- a/source/blender/blenkernel/BKE_layer.h
+++ b/source/blender/blenkernel/BKE_layer.h
@@ -135,18 +135,18 @@ void BKE_override_layer_collection_boolean_add(struct LayerCollection *layer_col
/* engine settings */
typedef void (*EngineSettingsCB)(struct RenderEngine *engine, struct IDProperty *props);
-struct IDProperty *BKE_layer_collection_engine_evaluated_get(struct Object *ob, const int type, const char *engine_name);
-struct IDProperty *BKE_layer_collection_engine_collection_get(struct LayerCollection *lc, const int type, const char *engine_name);
-struct IDProperty *BKE_layer_collection_engine_scene_get(struct Scene *scene, const int type, const char *engine_name);
+struct IDProperty *BKE_layer_collection_engine_evaluated_get(struct Object *ob, const char *engine_name);
+struct IDProperty *BKE_layer_collection_engine_collection_get(struct LayerCollection *lc, const char *engine_name);
+struct IDProperty *BKE_layer_collection_engine_scene_get(struct Scene *scene, const char *engine_name);
void BKE_layer_collection_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func);
void BKE_layer_collection_engine_settings_callback_free(void);
void BKE_layer_collection_engine_settings_create(struct IDProperty *root);
void BKE_layer_collection_engine_settings_validate_scene(struct Scene *scene);
void BKE_layer_collection_engine_settings_validate_collection(struct LayerCollection *lc);
-struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *view_layer, const int type, const char *engine_name);
-struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *view_layer, const int type, const char *engine_name);
-struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const int type, const char *engine_name);
+struct IDProperty *BKE_view_layer_engine_evaluated_get(struct ViewLayer *view_layer, const char *engine_name);
+struct IDProperty *BKE_view_layer_engine_layer_get(struct ViewLayer *view_layer, const char *engine_name);
+struct IDProperty *BKE_view_layer_engine_scene_get(struct Scene *scene, const char *engine_name);
void BKE_view_layer_engine_settings_callback_register(struct Main *bmain, const char *engine_name, EngineSettingsCB func);
void BKE_view_layer_engine_settings_callback_fre
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list