blender
/
blender
130
398
Fork 572
Code Issues 6.2k Pull Requests 747 Projects 19 Wiki Activity

Fix texture panel for Cycles 

I keep reading that texture painting is not working yet. However it is fully
working. We even have a "Full Shading" option in the viewport display panel.

Clay/EEVEE still need their UI figured out. But the context itself is doing
its part after this patch, and at least for Cycles it's working like 2.79.
This commit is contained in:
Dalai Felinto 2018-03-02 16:31:33 -03:00
parent c43d51c1c2
commit 3fc2d122c4
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
source/blender/editors/space_buttons/buttons_texture.c
View File

@ -351,18 +351,20 @@ static void buttons_texture_users_from_context(ListBase *users, const bContext *
workspace = (WorkSpace *)workspace;
}
if (!scene)
if (!scene) {
scene = CTX_data_scene(C);
if (!pinid || GS(pinid->name) == ID_SCE) {
wrld = scene->world;
brush = BKE_paint_brush(BKE_paint_get_active_from_context(C));
linestyle = BKE_linestyle_active_from_scene(scene);
}
else if (!pinid || GS(pinid->name) == ID_WS) {
if (!workspace) {
const ID_Type id_type = pinid != NULL ? GS(pinid->name) : -1;
if (!pinid || ELEM(id_type, ID_SCE, ID_WS)) {
brush = BKE_paint_brush(BKE_paint_get_active_from_context(C));
if (workspace == NULL) {
wrld = scene->world;
linestyle = BKE_linestyle_active_from_scene(scene);
workspace = CTX_wm_workspace(C);
}
ViewLayer *view_layer = BKE_view_layer_from_workspace_get(scene, workspace);
ob = OBACT(view_layer);
}