[Bf-blender-cvs] [1397ff2a326] greasepencil-object: Fix problems after merge

[Antonio Vazquez]

Commit: 1397ff2a326b223459f8be0f4f6d4e720fe6c7b1
Author: Antonio Vazquez
Date:   Sat Apr 22 19:04:20 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1397ff2a326b223459f8be0f4f6d4e720fe6c7b1

Fix problems after merge

===================================================================

M       source/blender/draw/intern/draw_cache.c
M       source/blender/draw/modes/object_mode.c

===================================================================

diff --git a/source/blender/draw/intern/draw_cache.c 
b/source/blender/draw/intern/draw_cache.c
index 20cd8c1014b..fddb2d8e98c 100644
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@ -497,8 +497,16 @@ Batch *DRW_cache_gpencil_axes_get(void)
                        VertexBuffer_set_attrib(vbo, pos_id, i + 6, 
verts[indices[i]]);
                }
 
+               SHC.drw_gpencil_axes = Batch_create(PRIM_LINES, vbo, NULL);
+       }
+       return SHC.drw_gpencil_axes;
+}
+
+
+/* -------------------------------------------------------------------- */
+
 /** \name Common Object API
- * \{ */
+* \{ */
 
 Batch *DRW_cache_object_surface_get(Object *ob)
 {
diff --git a/source/blender/draw/modes/object_mode.c 
b/source/blender/draw/modes/object_mode.c
index 29e0574634d..d6b84ab6b75 100644
--- a/source/blender/draw/modes/object_mode.c
+++ b/source/blender/draw/modes/object_mode.c
@@ -1139,7 +1139,7 @@ static void DRW_shgroup_gpencil(OBJECT_StorageList *stl, 
Object *ob, SceneLayer
        float *color;
        DRW_object_wire_theme_get(ob, sl, &color);
 
-       DRW_shgroup_dynamic_call_add(stl->g_data->gpencil_axes, color, 
&ob->empty_drawsize, ob->obmat);
+       DRW_shgroup_call_dynamic_add(stl->g_data->gpencil_axes, color, 
&ob->empty_drawsize, ob->obmat);
 }
 
 static void DRW_shgroup_speaker(OBJECT_StorageList *stl, Object *ob, 
SceneLayer *sl)

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs