Blender Git Loki
Git Commits -> Revision b486946
Revision b486946 by Dalai Felinto (master) July 14, 2017, 09:42 (GMT) |
Workspace: Fix crash on preview, and sanitize placeholder functions This commit effectively makes workspace switching useless as far as the active scene layer goes. The functions from the scene layer API to get the correct scene layer from "context" were a placeholder to be addressed by the workspace commit. When workspace was merged, however G.main was used as a replacement to pass the correct argument for the functions. As it turned out (surprise!) this leads to crash on render preview. We need to get rid of: * BKE_scene_layer_context_active_ex_PLACEHOLDER * BKE_scene_layer_context_active_PLACEHOLDER And either use SceneLayer explicitly or replace it by: * BKE_scene_layer_from_workspace_get |
Commit Details:
Full Hash: b48694639af41518a0e8c73da20121eda1685765
Parent Commit: 018df5a
Lines Changed: +57, -62
24 Modified Paths:
/source/blender/blenkernel/BKE_layer.h (+8, -3) (Diff)
/source/blender/blenkernel/intern/blendfile.c (+3, -2) (Diff)
/source/blender/blenkernel/intern/context.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/effect.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/layer.c (+20, -30) (Diff)
/source/blender/blenkernel/intern/scene.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+2, -2) (Diff)
/source/blender/depsgraph/intern/depsgraph_query.cc (+2, -2) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_context.c (+1, -2) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+1, -1) (Diff)
/source/blender/editors/space_image/space_image.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw_legacy.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_dynamicpaint.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_smoke.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_softbody.c (+1, -1) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/blendfile.c (+3, -2) (Diff)
/source/blender/blenkernel/intern/context.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/DerivedMesh.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/effect.c (+1, -1) (Diff)
/source/blender/blenkernel/intern/layer.c (+20, -30) (Diff)
/source/blender/blenkernel/intern/scene.c (+2, -2) (Diff)
/source/blender/blenkernel/intern/sequencer.c (+1, -1) (Diff)
/source/blender/blenloader/intern/versioning_280.c (+2, -2) (Diff)
/source/blender/depsgraph/intern/depsgraph_query.cc (+2, -2) (Diff)
/source/blender/editors/render/render_preview.c (+1, -1) (Diff)
/source/blender/editors/render/render_shading.c (+1, -1) (Diff)
/source/blender/editors/screen/screen_context.c (+1, -2) (Diff)
/source/blender/editors/space_buttons/buttons_context.c (+1, -1) (Diff)
/source/blender/editors/space_image/space_image.c (+1, -1) (Diff)
/source/blender/editors/space_outliner/outliner_tree.c (+1, -1) (Diff)
/source/blender/editors/space_view3d/view3d_draw_legacy.c (+3, -3) (Diff)
/source/blender/makesrna/intern/rna_scene.c (+1, -1) (Diff)
/source/blender/makesrna/intern/rna_space.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_dynamicpaint.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_smoke.c (+1, -1) (Diff)
/source/blender/modifiers/intern/MOD_softbody.c (+1, -1) (Diff)
/source/blender/render/intern/source/pipeline.c (+1, -1) (Diff)
/source/blender/windowmanager/intern/wm_event_system.c (+1, -1) (Diff)