[Bf-blender-cvs] [c46ce1bc817] soc-2018-npr: Merge changes
Yiming Wu
noreply at git.blender.org
Fri Mar 8 12:39:42 CET 2019
Commit: c46ce1bc817c67d8b2f4ee945ad992a84b2f3095
Author: Yiming Wu
Date: Fri Mar 8 19:39:02 2019 +0800
Branches: soc-2018-npr
https://developer.blender.org/rBc46ce1bc817c67d8b2f4ee945ad992a84b2f3095
Merge changes
===================================================================
M source/blender/blenloader/intern/versioning_280.c
M source/blender/draw/engines/lanpr/lanpr_dpix.c
M source/blender/draw/engines/lanpr/lanpr_engine.c
M source/blender/draw/engines/lanpr/lanpr_ops.c
M source/blender/draw/engines/lanpr/lanpr_snake.c
M source/blender/draw/intern/DRW_render.h
M source/blender/draw/intern/draw_manager_texture.c
M source/blender/makesdna/DNA_modifier_types.h
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_280.c b/source/blender/blenloader/intern/versioning_280.c
index 3d9ae899a32..cc4e3d93f25 100644
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@ -1539,7 +1539,7 @@ void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
if (!DNA_struct_find(fd->filesdna, "SceneLANPR")) {
- for (Scene *scene = bmain->scene.first; scene; scene = scene->id.next) {
+ for (Scene *scene = bmain->scenes.first; scene; scene = scene->id.next) {
scene->lanpr.crease_threshold = 0.7;
diff --git a/source/blender/draw/engines/lanpr/lanpr_dpix.c b/source/blender/draw/engines/lanpr/lanpr_dpix.c
index 19930cc8c95..9f5ce069240 100644
--- a/source/blender/draw/engines/lanpr/lanpr_dpix.c
+++ b/source/blender/draw/engines/lanpr/lanpr_dpix.c
@@ -377,8 +377,8 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, L
pd->dpix_sample_step = 1;
pd->dpix_buffer_width = TNS_DPIX_TEXTURE_SIZE;
pd->dpix_depth_offset = 0.0001;
- pd->dpix_znear = camera ? ((Camera *)camera->data)->clipsta : v3d->near;
- pd->dpix_zfar = camera ? ((Camera *)camera->data)->clipend : v3d->far;
+ pd->dpix_znear = camera ? ((Camera *)camera->data)->clip_start : v3d->clip_start;
+ pd->dpix_zfar = camera ? ((Camera *)camera->data)->clip_end : v3d->clip_end;
GPU_point_size(1);
//GPU_line_width(2);
@@ -386,7 +386,7 @@ void lanpr_dpix_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, L
DRW_draw_pass(psl->dpix_transform_pass);
GPU_framebuffer_bind(fbl->dpix_preview);
- GPUFrameBufferBits clear_bits = GPU_COLOR_BIT;
+ eGPUFrameBufferBits clear_bits = GPU_COLOR_BIT;
GPU_framebuffer_clear(fbl->dpix_preview, clear_bits, lanpr->background_color, clear_depth, clear_stencil);
DRW_draw_pass(psl->dpix_preview_pass);
diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 5d83bd72323..d09032d96a3 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -440,7 +440,7 @@ static void lanpr_draw_scene_exec(void *vedata, GPUFrameBuffer *dfb, int is_rend
uint clear_stencil = 0xFF;
GPU_framebuffer_bind(fbl->passes);
- GPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
+ eGPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
GPU_framebuffer_clear(fbl->passes, clear_bits, clear_col, clear_depth, clear_stencil);
const DRWContextState *draw_ctx = DRW_context_state_get();
@@ -585,7 +585,7 @@ static void lanpr_render_to_image(LANPR_Data *vedata, RenderEngine *engine, stru
float clear_col[4] = { 0.0f, 0.0f, 0.0f, 1.0f };
float clear_depth = 1.0f;
uint clear_stencil = 0xFF;
- GPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
+ eGPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
GPU_framebuffer_bind(dfbl->default_fb);
GPU_framebuffer_clear(dfbl->default_fb, clear_bits, clear_col, clear_depth, clear_stencil);
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index b5ceae667bd..f10dbfe5edb 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -1140,7 +1140,7 @@ void lanpr_cull_triangles(LANPR_RenderBuffer *rb) {
real view_dir[3], clip_advance[3];
tMatVectorCopy3d(rb->ViewVector,view_dir);
tMatVectorCopy3d(rb->ViewVector,clip_advance);
- tMatVectorMultiSelf3d(clip_advance, -((Camera*)cam->data)->clipsta);
+ tMatVectorMultiSelf3d(clip_advance, -((Camera*)cam->data)->clip_start);
tMatVectorAccum3d(cam_pos, clip_advance);
veln = lanpr_new_cull_point_space64(rb);
@@ -1826,11 +1826,11 @@ void lanpr_make_render_geometry_buffers(Depsgraph *depsgraph, Scene *s, Object *
real asp = ((real)rb->W / (real)rb->H);
if (cam->type == CAM_PERSP) {
- tmat_make_perspective_matrix_44d(proj, fov, asp, cam->clipsta, cam->clipend);
+ tmat_make_perspective_matrix_44d(proj, fov, asp, cam->clip_start, cam->clip_end);
} elif(cam->type == CAM_ORTHO)
{
real w = cam->ortho_scale/2;
- tmat_make_ortho_matrix_44d(proj, -w, w, -w / asp, w / asp, cam->clipsta, cam->clipend);
+ tmat_make_ortho_matrix_44d(proj, -w, w, -w / asp, w / asp, cam->clip_start, cam->clip_end);
}
tmat_load_identity_44d(view);
@@ -2477,8 +2477,8 @@ LANPR_RenderLine *lanpr_triangle_generate_intersection_line_only(LANPR_RenderBuf
LANPR_RenderVert *TE1 = 0;
LANPR_RenderVert *TE2 = 0;
tnsVector3d cl;// rb->Scene->ActiveCamera->GLocation;
- real ZMax = ((Camera *)rb->Scene->camera->data)->clipend;
- real ZMin = ((Camera *)rb->Scene->camera->data)->clipsta;
+ real ZMax = ((Camera *)rb->Scene->camera->data)->clip_end;
+ real ZMin = ((Camera *)rb->Scene->camera->data)->clip_start;
LANPR_RenderVert *Share = lanpr_triangle_share_point(Testing, rt);
tMatVectorConvert3fd(rb->Scene->camera->obmat[3], cl);
@@ -3155,7 +3155,7 @@ void lanpr_viewport_draw_offline_result(LANPR_TextureList *txl, LANPR_Framebuffe
DRW_draw_pass(psl->dpix_transform_pass);
GPU_framebuffer_bind(fbl->dpix_preview);
- GPUFrameBufferBits clear_bits = GPU_COLOR_BIT;
+ eGPUFrameBufferBits clear_bits = GPU_COLOR_BIT;
GPU_framebuffer_clear(fbl->dpix_preview, clear_bits, lanpr->background_color, clear_depth, clear_stencil);
DRW_draw_pass(psl->dpix_preview_pass);
@@ -3229,7 +3229,7 @@ void lanpr_software_draw_scene(void *vedata, GPUFrameBuffer *dfb, int is_render)
float clear_col[4] = { 1.0f, 0.0f, 0.0f, 1.0f };
float clear_depth = 1.0f;
uint clear_stencil = 0xFF;
- GPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
+ eGPUFrameBufferBits clear_bits = GPU_DEPTH_BIT | GPU_COLOR_BIT;
//Object *camera;
//if (v3d) {
diff --git a/source/blender/draw/engines/lanpr/lanpr_snake.c b/source/blender/draw/engines/lanpr/lanpr_snake.c
index 9c53f10fca5..f916578a25b 100644
--- a/source/blender/draw/engines/lanpr/lanpr_snake.c
+++ b/source/blender/draw/engines/lanpr/lanpr_snake.c
@@ -320,7 +320,7 @@ void lanpr_snake_free_readback_data(LANPR_PrivateData *pd) {
}
void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl, LANPR_PassList *psl, LANPR_PrivateData *pd, SceneLANPR *lanpr, GPUFrameBuffer *DefaultFB, int is_render){
- GPUFrameBufferBits clear_bits = GPU_COLOR_BIT | GPU_DEPTH_BIT;
+ eGPUFrameBufferBits clear_bits = GPU_COLOR_BIT | GPU_DEPTH_BIT;
float clear_col[4] = {0.0f, 0.0f, 0.0f, 0.0f};
float clear_depth = 1.0f;
uint clear_stencil = 0xFF;
@@ -337,8 +337,8 @@ void lanpr_snake_draw_scene(LANPR_TextureList *txl, LANPR_FramebufferList *fbl,
camera = scene->camera;
}
- pd->znear = camera ? ((Camera *)camera->data)->clipsta : 0.1;
- pd->zfar = camera ? ((Camera *)camera->data)->clipend : 100;
+ pd->znear = camera ? ((Camera *)camera->data)->clip_start : 0.1;
+ pd->zfar = camera ? ((Camera *)camera->data)->clip_end : 100;
pd->normal_clamp = lanpr->normal_clamp;
pd->normal_strength = lanpr->normal_strength;
pd->depth_clamp = lanpr->depth_clamp;
diff --git a/source/blender/draw/intern/DRW_render.h b/source/blender/draw/intern/DRW_render.h
index 6258d393128..153ec834e20 100644
--- a/source/blender/draw/intern/DRW_render.h
+++ b/source/blender/draw/intern/DRW_render.h
@@ -213,9 +213,9 @@ void DRW_texture_ensure_2D(
struct GPUTexture **tex, int w, int h, eGPUTextureFormat format, DRWTextureFlag flags);
void DRW_texture_ensure_fullscreen_2D_multisample(
- struct GPUTexture **tex, GPUTextureFormat format, int samples, DRWTextureFlag flags);
+ struct GPUTexture **tex, eGPUTextureFormat format, int samples, DRWTextureFlag flags);
void DRW_texture_ensure_2D_multisample(
- struct GPUTexture **tex, int w, int h, GPUTextureFormat format, int samples, DRWTextureFlag flags);
+ struct GPUTexture **tex, int w, int h, eGPUTextureFormat format, int samples, DRWTextureFlag flags);
void DRW_texture_generate_mipmaps(struct GPUTexture *tex);
void DRW_texture_free(struct GPUTexture *tex);
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index 0a804a9d37f..09b473f8b5f 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -89,7 +89,7 @@ GPUTexture *DRW_texture_create_2D(int w, int h, eGPUTextureFormat format, DRWTex
return tex;
}
-GPUTexture *DRW_texture_create_2D_multisample(int w, int h, GPUTextureFormat format, int samples, DRWTextureFlag flags, const float *fpixels)
+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);
@@ -146,7 +146,7 @@ void DRW_texture_ensure_2D(GPUTexture **tex, int w, int h, eGPUTextureFormat for
}
}
-void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex, GPUTextureFormat format, int samples, DRWTextureFlag flags)
+void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex, eGPUTextureFormat format, int samples, DRWTextureFlag flags)
{
if (*(tex) == NULL) {
const float *size = DRW_viewport_size_get();
@@ -154,7 +154,7 @@ void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex, GPUTextureFo
}
}
-void DRW_texture_ensure_2D_multisample(GPUTexture **tex, int w, int h, GPUTextureFormat format, int samples, DRWTextureFlag flags)
+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);
diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index 92511f2f396..a2c19b198ef 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -1769,7 +1769,7 @@ typedef struct MyBMeshModifierData {
struct Object *camera_ob;
void *osd_eval;
int flag; /* options stored here */
- short pad[2];
+ s
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list