[Bf-blender-cvs] [a93111b23d2] greasepencil-object: GPencil: Cleanup: Remove TODOs
Clément Foucault
noreply at git.blender.org
Thu Feb 13 21:09:03 CET 2020
Commit: a93111b23d2211cf9ea1694c39bb512abf50eafe
Author: Clément Foucault
Date: Thu Feb 13 21:08:49 2020 +0100
Branches: greasepencil-object
https://developer.blender.org/rBa93111b23d2211cf9ea1694c39bb512abf50eafe
GPencil: Cleanup: Remove TODOs
===================================================================
M source/blender/draw/engines/gpencil/gpencil_engine.h
M source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
===================================================================
diff --git a/source/blender/draw/engines/gpencil/gpencil_engine.h b/source/blender/draw/engines/gpencil/gpencil_engine.h
index 25fb1006bf4..e2009138def 100644
--- a/source/blender/draw/engines/gpencil/gpencil_engine.h
+++ b/source/blender/draw/engines/gpencil/gpencil_engine.h
@@ -380,7 +380,7 @@ void gpencil_material_resources_get(GPENCIL_MaterialPool *first_pool,
struct GPUTexture **r_tex_stroke,
struct GPUTexture **r_tex_fill,
struct GPUUniformBuffer **r_ubo_mat);
-/* Meh, TODO fix naming...*/
+
void gpencil_light_ambient_add(GPENCIL_LightPool *lightpool, const float color[3]);
void gpencil_light_pool_populate(GPENCIL_LightPool *matpool, Object *ob);
GPENCIL_LightPool *gpencil_light_pool_add(GPENCIL_PrivateData *pd);
diff --git a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
index 040d5ff64fb..8774b633467 100644
--- a/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
+++ b/source/blender/draw/engines/gpencil/shaders/gpencil_common_lib.glsl
@@ -190,7 +190,6 @@ float stroke_round_cap_mask(vec2 p1, vec2 p2, vec2 aspect, float thickness, floa
#endif
-/* TODO UBO */
uniform vec2 sizeViewport;
uniform vec2 sizeViewportInv;
@@ -387,7 +386,6 @@ void stroke_vertex()
gl_Position = (use_curr) ? ndc1 : ndc2;
finalPos = (use_curr) ? wpos1 : wpos2;
- /* TODO case where ndc1 & ndc2 is behind camera */
vec2 ss_adj = project_to_screenspace(ndc_adj);
vec2 ss1 = project_to_screenspace(ndc1);
vec2 ss2 = project_to_screenspace(ndc2);
More information about the Bf-blender-cvs
mailing list