Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Revert part of rB477f35 (error resolving conflict)

Browse Source
This commit is contained in:
Campbell Barton
2014-06-14 01:06:49 +10:00
parent 6c0926e802
commit 2ca497d84d
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/render/render_preview.c
View File

@@ -299,10 +299,10 @@ static Scene *preview_prepare_scene(Scene *scene, ID *id, int id_type, ShaderPre
sce->r.cfra = scene->r.cfra; sce->r.cfra = scene->r.cfra;
if (id_type == ID_TE && sp->pr_method == PR_ICON_RENDER) { if (id_type == ID_TE && ELEM(sp->pr_method, PR_ICON_RENDER, PR_NODE_RENDER)) {
/* force blender internal for texture icons render, /* Force blender internal for texture icons and nodes render,
* seems commonly used render engines does not support * seems commonly used render engines does not support
* such kind of rendering * such kind of rendering.
*/ */
BLI_strncpy(sce->r.engine, "BLENDER_RENDER", sizeof(sce->r.engine)); BLI_strncpy(sce->r.engine, "BLENDER_RENDER", sizeof(sce->r.engine));
} }
@@ -1137,11 +1137,6 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
wmJob *wm_job; wmJob *wm_job;
ShaderPreview *sp; ShaderPreview *sp;
Scene *scene = CTX_data_scene(C); Scene *scene = CTX_data_scene(C);
const bool use_new_shading = BKE_scene_use_new_shading_nodes(scene);
/* node previews not supported for cycles */
if ((method == PR_NODE_RENDER) && use_new_shading)
return;
wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), owner, "Shader Preview", wm_job = WM_jobs_get(CTX_wm_manager(C), CTX_wm_window(C), owner, "Shader Preview",
WM_JOB_EXCL_RENDER, WM_JOB_TYPE_RENDER_PREVIEW); WM_JOB_EXCL_RENDER, WM_JOB_TYPE_RENDER_PREVIEW);
@@ -1159,7 +1154,7 @@ void ED_preview_shader_job(const bContext *C, void *owner, ID *id, ID *parent, M
/* hardcoded preview .blend for cycles/internal, this should be solved /* hardcoded preview .blend for cycles/internal, this should be solved
* once with custom preview .blend path for external engines */ * once with custom preview .blend path for external engines */
if (use_new_shading) if ((method != PR_NODE_RENDER) && BKE_scene_use_new_shading_nodes(scene))
sp->pr_main = G_pr_main_cycles; sp->pr_main = G_pr_main_cycles;
else else
sp->pr_main = G_pr_main; sp->pr_main = G_pr_main;

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

@@ -442,7 +442,7 @@ void buttons_texture_context_compute(const bContext *C, SpaceButs *sbuts)
set_texture_context(C, sbuts); set_texture_context(C, sbuts);
if (!(BKE_scene_use_new_shading_nodes(scene) || (sbuts->texture_context == SB_TEXC_OTHER))) { if (!((sbuts->texture_context == SB_TEXC_OTHER) || BKE_scene_use_new_shading_nodes(scene))) {
if (ct) { if (ct) {
BLI_freelistN(&ct->users); BLI_freelistN(&ct->users);
MEM_freeN(ct); MEM_freeN(ct);