[Bf-blender-cvs] [db975035401] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object
Antonio Vazquez
noreply at git.blender.org
Sun Apr 16 15:56:31 CEST 2017
Commit: db975035401c1147e335de80af8330711f72bf26
Author: Antonio Vazquez
Date: Sun Apr 16 15:56:06 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBdb975035401c1147e335de80af8330711f72bf26
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/draw/intern/draw_cache.c
index 6828e2face6,8e6c64943bd..74135156ee0
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@@ -111,14 -110,18 +111,19 @@@ void DRW_shape_cache_free(void
BATCH_DISCARD_ALL_SAFE(SHC.drw_camera);
BATCH_DISCARD_ALL_SAFE(SHC.drw_camera_tria);
BATCH_DISCARD_ALL_SAFE(SHC.drw_camera_focus);
+ BATCH_DISCARD_ALL_SAFE(SHC.drw_gpencil_axes);
}
- /* Helper functions */
- static void add_fancy_edge(VertexBuffer *vbo, unsigned int pos_id, unsigned int n1_id, unsigned int n2_id,
- unsigned int *v_idx, const float co1[3], const float co2[3],
- const float n1[3], const float n2[3])
+ /* -------------------------------------------------------------------- */
+
+ /** \name Helper functions
+ * \{ */
+
+ static void add_fancy_edge(
+ VertexBuffer *vbo, unsigned int pos_id, unsigned int n1_id, unsigned int n2_id,
+ unsigned int *v_idx, const float co1[3], const float co2[3],
+ const float n1[3], const float n2[3])
{
VertexBuffer_set_attrib(vbo, n1_id, *v_idx, n1);
VertexBuffer_set_attrib(vbo, n2_id, *v_idx, n2);
More information about the Bf-blender-cvs
mailing list