diff options
author | Yiming Wu <xp8110@outlook.com> | 2019-04-04 15:33:16 +0300 |
---|---|---|
committer | Yiming Wu <xp8110@outlook.com> | 2019-04-04 15:33:16 +0300 |
commit | 47495f6f092f5282135c31152ed8c24eac83ae42 (patch) | |
tree | 12be8c91a0df54c626533c81f500e175c37ecd82 | |
parent | 525c9034cd77e22d9307f3813c47a314269dda73 (diff) |
Fix errors
-rw-r--r-- | release/scripts/startup/bl_operators/lanpr.py | 2 | ||||
-rw-r--r-- | release/scripts/startup/bl_ui/properties_scene.py | 24 | ||||
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_dpix.c | 16 | ||||
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_engine.c | 4 | ||||
-rw-r--r-- | source/blender/draw/engines/lanpr/lanpr_ops.c | 2 | ||||
-rw-r--r-- | source/blender/draw/intern/draw_manager_texture.c | 12 | ||||
-rw-r--r-- | source/blender/modifiers/intern/MOD_mybmesh.c | 2 |
7 files changed, 35 insertions, 27 deletions
diff --git a/release/scripts/startup/bl_operators/lanpr.py b/release/scripts/startup/bl_operators/lanpr.py index 19df57af34b..6e89542a08a 100644 --- a/release/scripts/startup/bl_operators/lanpr.py +++ b/release/scripts/startup/bl_operators/lanpr.py @@ -33,7 +33,7 @@ def lanpr_make_composition_scene(scene): name = scene.name; new_name = scene.name+'_lanpr_comp' scene.name = new_name - bpy.ops.scene.new(type='LINK_OBJECTS') + bpy.ops.scene.new(type='LINK_COPY') for s in bpy.data.scenes: if s.name == new_name+'.001': new_scene = s diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index a8a0927b183..b454994e900 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -620,11 +620,6 @@ class SCENE_PT_lanpr(SceneButtonsPanel, Panel): sc = lanpr_get_composition_scene(scene) - if lanpr_is_composition_scene(scene): - row = layout.row() - row.scale_y=1.5 - row.operator("lanpr.goto_original_scene") - if sc is not None: layout.label(text = 'You are adjusting values for LANPR compostion scene.') row = layout.row() @@ -639,14 +634,19 @@ class SCENE_PT_lanpr(SceneButtonsPanel, Panel): layout.label(text = 'Select LANPR engine or use composition scene.') layout.operator("lanpr.make_composition_scene") return + + if lanpr_is_composition_scene(scene): + row = layout.row() + row.scale_y=1.5 + row.operator("lanpr.goto_original_scene") - layout.label(text='LANPR Composition') - row = layout.row() - row.scale_y=1.5 - row.scale_x=4 - row.operator("lanpr.render_composited", icon = 'RENDER_STILL') - row.scale_x=1 - row.prop(lanpr,"composite_render_animation", toggle=True, icon = 'RENDER_ANIMATION') + layout.label(text='LANPR Composition') + row = layout.row() + row.scale_y=1.5 + row.scale_x=4 + row.operator("lanpr.render_composited", icon = 'RENDER_STILL') + row.scale_x=1 + row.prop(lanpr,"composite_render_animation", toggle=True, icon = 'RENDER_ANIMATION') layout.label(text='Mode:') diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c index 9f5ce069240..782746df0ec 100644 --- a/source/blender/draw/engines/lanpr/lanpr_dpix.c +++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c @@ -46,14 +46,14 @@ void lanpr_init_atlas_inputs(void *ved){ SceneLANPR *lanpr = &draw_ctx->scene->lanpr; if (lanpr->reloaded || !txl->dpix_in_pl) { - DRW_texture_ensure_2D(&txl->dpix_in_pl, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); - DRW_texture_ensure_2D(&txl->dpix_in_pr, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); - DRW_texture_ensure_2D(&txl->dpix_in_nl, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); - DRW_texture_ensure_2D(&txl->dpix_in_nr, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); - DRW_texture_ensure_2D(&txl->dpix_in_edge_mask, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA8, 0); - DRW_texture_ensure_2D(&txl->dpix_out_pl, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); - DRW_texture_ensure_2D(&txl->dpix_out_pr, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); - DRW_texture_ensure_2D(&txl->dpix_out_length, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_in_pl, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_in_pr, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_in_nl, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_in_nr, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_in_edge_mask, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA8, 0); + DRW_texture_ensure_2d(&txl->dpix_out_pl, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_out_pr, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); + DRW_texture_ensure_2d(&txl->dpix_out_length, TNS_DPIX_TEXTURE_SIZE, TNS_DPIX_TEXTURE_SIZE, GPU_RGBA32F, 0); } GPU_framebuffer_ensure_config(&fbl->dpix_transform, { diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c index d09032d96a3..a8d5f95ceab 100644 --- a/source/blender/draw/engines/lanpr/lanpr_engine.c +++ b/source/blender/draw/engines/lanpr/lanpr_engine.c @@ -561,8 +561,8 @@ static void lanpr_render_to_image(LANPR_Data *vedata, RenderEngine *engine, stru DefaultFramebufferList *dfbl = DRW_viewport_framebuffer_list_get(); DefaultTextureList *dtxl = DRW_viewport_texture_list_get(); - DRW_texture_ensure_fullscreen_2D(&dtxl->depth, GPU_DEPTH_COMPONENT32F, 0); - DRW_texture_ensure_fullscreen_2D(&dtxl->color, GPU_RGBA32F, 0); + DRW_texture_ensure_fullscreen_2d(&dtxl->depth, GPU_DEPTH_COMPONENT32F, 0); + DRW_texture_ensure_fullscreen_2d(&dtxl->color, GPU_RGBA32F, 0); GPU_framebuffer_ensure_config(&dfbl->default_fb, { GPU_ATTACHMENT_TEXTURE(dtxl->depth), diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c index d110067ecbc..104a881505c 100644 --- a/source/blender/draw/engines/lanpr/lanpr_ops.c +++ b/source/blender/draw/engines/lanpr/lanpr_ops.c @@ -1718,7 +1718,7 @@ void lanpr_make_render_geometry_buffers_object(Object *o, real *MVMat, real *MVP &((struct BMeshCreateParams) {.use_toolflags = true, })); BM_mesh_bm_from_me(bm, o->data, &((struct BMeshFromMeshParams) {.calc_face_normal = true, })); BM_mesh_elem_hflag_disable_all(bm, BM_FACE | BM_EDGE, BM_ELEM_TAG, false); - BM_mesh_triangulate(bm, MOD_TRIANGULATE_QUAD_BEAUTY, MOD_TRIANGULATE_NGON_BEAUTY, false, NULL, NULL, NULL); + BM_mesh_triangulate(bm, MOD_TRIANGULATE_QUAD_BEAUTY, MOD_TRIANGULATE_NGON_BEAUTY, 4, false, NULL, NULL, NULL); BM_mesh_normals_update(bm); BM_mesh_elem_table_ensure(bm, BM_VERT | BM_EDGE | BM_FACE); BM_mesh_elem_index_ensure(bm, BM_VERT | BM_EDGE | BM_FACE); diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c index e138ac99533..ed7da41692f 100644 --- a/source/blender/draw/intern/draw_manager_texture.c +++ b/source/blender/draw/intern/draw_manager_texture.c @@ -98,6 +98,14 @@ GPUTexture *DRW_texture_create_2d_array( return tex; } +GPUTexture *DRW_texture_create_2d_multisample(int w, int h, eGPUTextureFormat format, int samples, DRWTextureFlag flags, const float *fpixels) +{ + GPUTexture *tex = GPU_texture_create_2d_multisample(w, h, format, fpixels, samples, NULL); + drw_texture_set_parameters(tex, flags); + + return tex; +} + GPUTexture *DRW_texture_create_3d( int w, int h, int d, eGPUTextureFormat format, DRWTextureFlag flags, const float *fpixels) { @@ -142,14 +150,14 @@ void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex, eGPUTextureF { if (*(tex) == NULL) { const float *size = DRW_viewport_size_get(); - *(tex) = DRW_texture_create_2D_multisample((int)size[0], (int)size[1], format, samples, flags, NULL); + *(tex) = DRW_texture_create_2d_multisample((int)size[0], (int)size[1], format, samples, flags, NULL); } } void DRW_texture_ensure_2D_multisample(GPUTexture **tex, int w, int h, eGPUTextureFormat format, int samples, DRWTextureFlag flags) { if (*(tex) == NULL) { - *(tex) = DRW_texture_create_2D_multisample(w, h, format, samples, flags, NULL); + *(tex) = DRW_texture_create_2d_multisample(w, h, format, samples, flags, NULL); } } diff --git a/source/blender/modifiers/intern/MOD_mybmesh.c b/source/blender/modifiers/intern/MOD_mybmesh.c index efbb5346ade..f87c9151f6c 100644 --- a/source/blender/modifiers/intern/MOD_mybmesh.c +++ b/source/blender/modifiers/intern/MOD_mybmesh.c @@ -4287,7 +4287,7 @@ static Mesh *mybmesh_do(Mesh *mesh, MyBMeshModifierData *mmd, float cam_loc[3]) if (mmd->flag & MOD_MYBMESH_TRIANG) { //TODO check if shortest diagonal is better - BM_mesh_triangulate(bm, MOD_TRIANGULATE_QUAD_FIXED, MOD_TRIANGULATE_NGON_BEAUTY, false, NULL, NULL, NULL); + BM_mesh_triangulate(bm, MOD_TRIANGULATE_QUAD_FIXED, MOD_TRIANGULATE_NGON_BEAUTY, 4, false, NULL, NULL, NULL); } if( mmd->camera_ob == NULL){ |