[Bf-blender-cvs] [ba5c4414b0b] temp-lanpr-review: Cleanup: Function logic and unused variables.
YimingWu
noreply at git.blender.org
Wed Nov 20 14:33:31 CET 2019
Commit: ba5c4414b0b6998bff01763dbdeec6629a9cbc87
Author: YimingWu
Date: Wed Nov 20 21:30:13 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rBba5c4414b0b6998bff01763dbdeec6629a9cbc87
Cleanup: Function logic and unused variables.
===================================================================
M source/blender/draw/intern/draw_manager_texture.c
M source/blender/editors/lanpr/lanpr_cpu.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager_texture.c b/source/blender/draw/intern/draw_manager_texture.c
index 87bbe4025ea..96f69d21ea5 100644
--- a/source/blender/draw/intern/draw_manager_texture.c
+++ b/source/blender/draw/intern/draw_manager_texture.c
@@ -155,7 +155,7 @@ void DRW_texture_ensure_2d(
void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex,
eGPUTextureFormat format,
int samples,
- DRWTextureFlag flags)
+ DRWTextureFlag UNUSED(flags))
{
if (*(tex) == NULL) {
const float *size = DRW_viewport_size_get();
@@ -165,7 +165,7 @@ void DRW_texture_ensure_fullscreen_2D_multisample(GPUTexture **tex,
}
void DRW_texture_ensure_2D_multisample(
- GPUTexture **tex, int w, int h, eGPUTextureFormat format, int samples, DRWTextureFlag flags)
+ GPUTexture **tex, int w, int h, eGPUTextureFormat format, int samples, DRWTextureFlag UNUSED(flags))
{
if (*(tex) == NULL) {
*(tex) = GPU_texture_create_2d_multisample(w, h, format, NULL, samples, NULL);
diff --git a/source/blender/editors/lanpr/lanpr_cpu.c b/source/blender/editors/lanpr/lanpr_cpu.c
index 09f7ad4267b..0939c2c0fba 100644
--- a/source/blender/editors/lanpr/lanpr_cpu.c
+++ b/source/blender/editors/lanpr/lanpr_cpu.c
@@ -1831,7 +1831,7 @@ static void lanpr_make_render_geometry_buffers_object(
int ED_lanpr_object_collection_usage_check(Collection *c, Object *o)
{
CollectionChild *cc;
- int object_is_used = (o->lanpr.usage == OBJECT_FEATURE_LINE_INCLUDE &&
+ int object_is_used = (o->lanpr.usage == OBJECT_FEATURE_LINE_INCLUDE ||
o->lanpr.usage == OBJECT_FEATURE_LINE_INHERENT);
if (object_is_used && (c->lanpr.flags & LANPR_LINE_LAYER_COLLECTION_FORCE) &&
More information about the Bf-blender-cvs
mailing list