Blender Git Loki
Git Commits -> Revision e4f2b2b
Revision e4f2b2b by Dalai Felinto (master) October 16, 2017, 19:29 (GMT) |
Workspace: Move engines to workspace and Properties Editor cleanup Engine is not stored in WorkSpaces. That defines the "context" engine, which is used for the entire UI. The engine used for the poll of nodes (add node menu, new nodes when "Use Nodes") is obtained from context. Introduce a ViewRender struct for viewport settings that are defined for workspaces and scene. This struct will be populated with the hand-picked settings that can be defined per workspace as per the 2.8 design. * use_scene_settings * properties editor: workshop + organize context path Use Scene Settings ================== For viewport drawing, Workspaces have an option to use the Scene render settings (F12) instead of the viewport settings. This way users can quickly preview the final render settings, engine and View Layer. This will affect all the editors in that workspace, and it will be clearly indicated in the top-bar. Properties Editor: Add Workspace and organize context path ========================================================== We now have the properties of: Scene, Scene > Layer, Scene > World, Workspace [Scene | Workspace] > Render Layer > Object [Scene | Workspace] > Render Layer > Object > Data (...) Reviewers: Campbell Barton, Julian Eisel Differential Revision: https://developer.blender.org/D2842 |
Commit Details:
Full Hash: e4f2b2be26adbb5c34231598526a270559c6e183
Parent Commit: e8962f9
Lines Changed: +1385, -753
1 Added Path:
/release/scripts/startup/bl_ui/properties_data_workspace.py (+78, -0) (View)
134 Modified Paths:
/intern/cycles/app/io_export_cycles_xml.py (+1, -2) (Diff)
/intern/cycles/blender/addon/ui.py (+3, -4) (Diff)
/release/scripts/startup/bl_ui/properties_collection.py (+9, -9) (Diff)
/release/scripts/startup/bl_ui/properties_data_armature.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_camera.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/properties_data_lamp.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_data_lightprobe.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_speaker.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+8, -5) (Diff)
/release/scripts/startup/bl_ui/properties_game.py (+20, -20) (Diff)
/release/scripts/startup/bl_ui/properties_material.py (+24, -24) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_physics_cloth.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_common.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+19, -19) (Diff)
/release/scripts/startup/bl_ui/properties_physics_field.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_physics_rigidbody.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_smoke.py (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_physics_softbody.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+36, -12) (Diff)
/release/scripts/startup/bl_ui/properties_render_layer.py (+13, -13) (Diff)
/release/scripts/startup/bl_ui/properties_scene.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/properties_world.py (+5, -6) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+9, -8) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+6, -5) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+3, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+1, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+4, -4) (Diff)
/source/blender/blenkernel/BKE_context.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_layer.h (+28, -3) (Diff)
/source/blender/blenkernel/BKE_node.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_pointcache.h (+3, -1) (Diff)
/source/blender/blenkernel/BKE_scene.h (+31, -4) (Diff)
/source/blender/blenkernel/BKE_screen.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_workspace.h (+6, -0) (Diff)
/source/blender/blenkernel/intern/collision.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/context.c (+31, -2) (Diff)
/source/blender/blenkernel/intern/layer.c (+90, -10) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/scene.c (+100, -31) (Diff)
/source/blender/blenkernel/intern/sound.c (+76, -54) (Diff)
/source/blender/blenkernel/intern/workspace.c (+27, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+13, -1) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+3, -1) (Diff)
/source/blender/depsgraph/DEG_depsgraph.h (+3, -0) (Diff)
/source/blender/depsgraph/intern/depsgraph_eval.cc (+2, -0) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc (+3, -3) (Diff)
/source/blender/draw/DRW_engine.h (+4, -0) (Diff)
/source/blender/draw/engines/external/external_engine.c (+4, -5) (Diff)
/source/blender/draw/intern/draw_manager.c (+36, -25) (Diff)
/source/blender/draw/intern/DRW_render.h (+2, -0) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+1, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+1, -1) (Diff)
/source/blender/editors/include/ED_screen.h (+5, -2) (Diff)
/source/blender/editors/include/ED_transform_snap_object_context.h (+3, -2) (Diff)
/source/blender/editors/include/ED_view3d.h (+11, -4) (Diff)
/source/blender/editors/interface/interface_templates.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -1) (Diff)
/source/blender/editors/physics/physics_pointcache.c (+1, -0) (Diff)
/source/blender/editors/render/render_internal.c (+35, -20) (Diff)
/source/blender/editors/render/render_opengl.c (+9, -4) (Diff)
/source/blender/editors/render/render_preview.c (+15, -5) (Diff)
/source/blender/editors/render/render_update.c (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+2, -2) (Diff)
/source/blender/editors/screen/screen_context.c (+1, -1) (Diff)
/source/blender/editors/screen/workspace_edit.c (+7, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+2, -2) (Diff)
/source/blender/editors/space_action/space_action.c (+2, -1) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+75, -53) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+6, -3) (Diff)
/source/blender/editors/space_clip/space_clip.c (+2, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+2, -1) (Diff)
/source/blender/editors/space_graph/space_graph.c (+2, -1) (Diff)
/source/blender/editors/space_image/space_image.c (+3, -2) (Diff)
/source/blender/editors/space_nla/space_nla.c (+2, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+6, -6) (Diff)
/source/blender/editors/space_node/node_templates.c (+2, -1) (Diff)
/source/blender/editors/space_node/space_node.c (+4, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+2, -1) (Diff)
/source/blender/editors/space_text/space_text.c (+2, -1) (Diff)
/source/blender/editors/space_time/space_time.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+18, -14) (Diff)
/source/blender/editors/space_view3d/view3d_draw_legacy.c (+3, -5) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_walk.c (+5, -1) (Diff)
/source/blender/editors/transform/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/transform/transform.h (+4, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -2) (Diff)
/source/blender/editors/transform/transform_generics.c (+4, -0) (Diff)
/source/blender/editors/transform/transform_snap.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+4, -4) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+9, -2) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -0) (Diff)
/source/blender/makesdna/dna_workspace_types.h (+9, -1) (Diff)
/source/blender/makesrna/intern/rna_context.c (+31, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+105, -147) (Diff)
/source/blender/makesrna/intern/rna_scene_api.c (+13, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+20, -7) (Diff)
/source/blender/makesrna/intern/rna_workspace.c (+21, -1) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+2, -1) (Diff)
/source/blender/nodes/shader/node_shader_tree.c (+15, -8) (Diff)
/source/blender/nodes/texture/node_texture_tree.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+5, -2) (Diff)
/source/blender/render/intern/include/renderpipeline.h (+2, -0) (Diff)
/source/blender/render/intern/include/render_types.h (+1, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+5, -0) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -2) (Diff)
/source/blender/render/intern/source/external_engine.c (+5, -5) (Diff)
/source/blender/render/intern/source/pipeline.c (+42, -29) (Diff)
/source/blender/render/intern/source/pointdensity.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+3, -2) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+7, -6) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+10, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+4, -2) (Diff)
/source/creator/creator_args.c (+1, -3) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+1, -0) (Diff)
/intern/cycles/blender/addon/ui.py (+3, -4) (Diff)
/release/scripts/startup/bl_ui/properties_collection.py (+9, -9) (Diff)
/release/scripts/startup/bl_ui/properties_data_armature.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_camera.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/properties_data_lamp.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_data_lightprobe.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_data_mesh.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_data_modifier.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_data_speaker.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_freestyle.py (+8, -5) (Diff)
/release/scripts/startup/bl_ui/properties_game.py (+20, -20) (Diff)
/release/scripts/startup/bl_ui/properties_material.py (+24, -24) (Diff)
/release/scripts/startup/bl_ui/properties_object.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/properties_particle.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_physics_cloth.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_common.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py (+19, -19) (Diff)
/release/scripts/startup/bl_ui/properties_physics_field.py (+6, -6) (Diff)
/release/scripts/startup/bl_ui/properties_physics_fluid.py (+8, -8) (Diff)
/release/scripts/startup/bl_ui/properties_physics_rigidbody.py (+3, -3) (Diff)
/release/scripts/startup/bl_ui/properties_physics_rigidbody_constraint.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_physics_smoke.py (+12, -12) (Diff)
/release/scripts/startup/bl_ui/properties_physics_softbody.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/properties_render.py (+36, -12) (Diff)
/release/scripts/startup/bl_ui/properties_render_layer.py (+13, -13) (Diff)
/release/scripts/startup/bl_ui/properties_scene.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/properties_texture.py (+10, -10) (Diff)
/release/scripts/startup/bl_ui/properties_world.py (+5, -6) (Diff)
/release/scripts/startup/bl_ui/space_image.py (+1, -1) (Diff)
/release/scripts/startup/bl_ui/space_info.py (+9, -8) (Diff)
/release/scripts/startup/bl_ui/space_node.py (+6, -5) (Diff)
/release/scripts/startup/bl_ui/space_view3d.py (+3, -2) (Diff)
/release/scripts/startup/bl_ui/space_view3d_toolbar.py (+2, -2) (Diff)
/release/scripts/startup/bl_ui/__init__.py (+1, -0) (Diff)
/release/scripts/startup/nodeitems_builtins.py (+4, -4) (Diff)
/source/blender/blenkernel/BKE_context.h (+4, -0) (Diff)
/source/blender/blenkernel/BKE_layer.h (+28, -3) (Diff)
/source/blender/blenkernel/BKE_node.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_pointcache.h (+3, -1) (Diff)
/source/blender/blenkernel/BKE_scene.h (+31, -4) (Diff)
/source/blender/blenkernel/BKE_screen.h (+1, -1) (Diff)
/source/blender/blenkernel/BKE_sequencer.h (+2, -1) (Diff)
/source/blender/blenkernel/BKE_workspace.h (+6, -0) (Diff)
/source/blender/blenkernel/intern/collision.c (+1, -0) (Diff)
/source/blender/blenkernel/intern/context.c (+31, -2) (Diff)
/source/blender/blenkernel/intern/layer.c (+90, -10) (Diff)
/source/blender/blenkernel/intern/pointcache.c (+5, -3) (Diff)
/source/blender/blenkernel/intern/scene.c (+100, -31) (Diff)
/source/blender/blenkernel/intern/sound.c (+76, -54) (Diff)
/source/blender/blenkernel/intern/workspace.c (+27, -0) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+13, -1) (Diff)
/source/blender/blenloader/intern/versioning_defaults.c (+3, -1) (Diff)
/source/blender/depsgraph/DEG_depsgraph.h (+3, -0) (Diff)
/source/blender/depsgraph/intern/depsgraph_eval.cc (+2, -0) (Diff)
/source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc (+3, -3) (Diff)
/source/blender/draw/DRW_engine.h (+4, -0) (Diff)
/source/blender/draw/engines/external/external_engine.c (+4, -5) (Diff)
/source/blender/draw/intern/draw_manager.c (+36, -25) (Diff)
/source/blender/draw/intern/DRW_render.h (+2, -0) (Diff)
/source/blender/editors/armature/editarmature_sketch.c (+1, -1) (Diff)
/source/blender/editors/curve/editcurve.c (+1, -1) (Diff)
/source/blender/editors/include/ED_screen.h (+5, -2) (Diff)
/source/blender/editors/include/ED_transform_snap_object_context.h (+3, -2) (Diff)
/source/blender/editors/include/ED_view3d.h (+11, -4) (Diff)
/source/blender/editors/interface/interface_templates.c (+1, -1) (Diff)
/source/blender/editors/mesh/editmesh_tools.c (+1, -1) (Diff)
/source/blender/editors/physics/physics_pointcache.c (+1, -0) (Diff)
/source/blender/editors/render/render_internal.c (+35, -20) (Diff)
/source/blender/editors/render/render_opengl.c (+9, -4) (Diff)
/source/blender/editors/render/render_preview.c (+15, -5) (Diff)
/source/blender/editors/render/render_update.c (+1, -1) (Diff)
/source/blender/editors/screen/area.c (+2, -2) (Diff)
/source/blender/editors/screen/screen_context.c (+1, -1) (Diff)
/source/blender/editors/screen/workspace_edit.c (+7, -3) (Diff)
/source/blender/editors/sculpt_paint/paint_image_proj.c (+2, -2) (Diff)
/source/blender/editors/space_action/space_action.c (+2, -1) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+75, -53) (Diff)
/source/blender/editors/space_buttons/space_buttons.c (+6, -3) (Diff)
/source/blender/editors/space_clip/space_clip.c (+2, -1) (Diff)
/source/blender/editors/space_file/space_file.c (+2, -1) (Diff)
/source/blender/editors/space_graph/space_graph.c (+2, -1) (Diff)
/source/blender/editors/space_image/space_image.c (+3, -2) (Diff)
/source/blender/editors/space_nla/space_nla.c (+2, -1) (Diff)
/source/blender/editors/space_node/node_edit.c (+6, -6) (Diff)
/source/blender/editors/space_node/node_templates.c (+2, -1) (Diff)
/source/blender/editors/space_node/space_node.c (+4, -2) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+1, -1) (Diff)
/source/blender/editors/space_sequencer/space_sequencer.c (+2, -1) (Diff)
/source/blender/editors/space_text/space_text.c (+2, -1) (Diff)
/source/blender/editors/space_time/space_time.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/space_view3d.c (+2, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw.c (+18, -14) (Diff)
/source/blender/editors/space_view3d/view3d_draw_legacy.c (+3, -5) (Diff)
/source/blender/editors/space_view3d/view3d_ruler.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_select.c (+1, -0) (Diff)
/source/blender/editors/space_view3d/view3d_walk.c (+5, -1) (Diff)
/source/blender/editors/transform/CMakeLists.txt (+1, -0) (Diff)
/source/blender/editors/transform/transform.h (+4, -0) (Diff)
/source/blender/editors/transform/transform_conversions.c (+2, -2) (Diff)
/source/blender/editors/transform/transform_generics.c (+4, -0) (Diff)
/source/blender/editors/transform/transform_snap.c (+1, -1) (Diff)
/source/blender/editors/transform/transform_snap_object.c (+4, -4) (Diff)
/source/blender/freestyle/intern/blender_interface/BlenderStrokeRenderer.cpp (+3, -3) (Diff)
/source/blender/gpu/intern/gpu_material.c (+1, -0) (Diff)
/source/blender/makesdna/DNA_layer_types.h (+0, -1) (Diff)
/source/blender/makesdna/DNA_scene_types.h (+9, -2) (Diff)
/source/blender/makesdna/DNA_space_types.h (+1, -0) (Diff)
/source/blender/makesdna/dna_workspace_types.h (+9, -1) (Diff)
/source/blender/makesrna/intern/rna_context.c (+31, -0) (Diff)
/source/blender/makesrna/intern/rna_nodetree.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+105, -147) (Diff)
/source/blender/makesrna/intern/rna_scene_api.c (+13, -2) (Diff)
/source/blender/makesrna/intern/rna_space.c (+20, -7) (Diff)
/source/blender/makesrna/intern/rna_workspace.c (+21, -1) (Diff)
/source/blender/makesrna/RNA_access.h (+1, -0) (Diff)
/source/blender/nodes/composite/nodes/node_composite_image.c (+2, -1) (Diff)
/source/blender/nodes/shader/node_shader_tree.c (+15, -8) (Diff)
/source/blender/nodes/texture/node_texture_tree.c (+1, -1) (Diff)
/source/blender/render/extern/include/RE_pipeline.h (+5, -2) (Diff)
/source/blender/render/intern/include/renderpipeline.h (+2, -0) (Diff)
/source/blender/render/intern/include/render_types.h (+1, -0) (Diff)
/source/blender/render/intern/source/convertblender.c (+5, -0) (Diff)
/source/blender/render/intern/source/envmap.c (+1, -2) (Diff)
/source/blender/render/intern/source/external_engine.c (+5, -5) (Diff)
/source/blender/render/intern/source/pipeline.c (+42, -29) (Diff)
/source/blender/render/intern/source/pointdensity.c (+2, -2) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+3, -2) (Diff)
/source/blender/windowmanager/intern/wm_files.c (+7, -6) (Diff)
/source/blender/windowmanager/intern/wm_window.c (+10, -0) (Diff)
/source/blender/windowmanager/WM_api.h (+1, -0) (Diff)
/source/blenderplayer/bad_level_call_stubs/stubs.c (+4, -2) (Diff)
/source/creator/creator_args.c (+1, -3) (Diff)
/source/gameengine/Converter/BL_BlenderDataConversion.cpp (+1, -0) (Diff)
Master Commits
MiikaH:n Sivut a.k.a. MiikaHweb | 2003-2021