Commit: 5cb43b0f2037c903c635609c75ebf0c3a23ad146
Author: Campbell Barton
Date: Mon Jan 15 23:44:19 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB5cb43b0f2037c903c635609c75ebf0c3a23ad146
Cleanup: update comments
===================================================================
M
source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
M source/blender/editors/space_view3d/view3d_manipulator_navigate.c
M source/blender/gpu/intern/gpu_batch.c
===================================================================
diff --git
a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
index eb1972f9919..6d5b6332ec5 100644
---
a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
+++
b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
@@ -23,11 +23,12 @@
*
* \name Button Manipulator
*
- * 3D Manipulator, also works in 2D views.
+ * 2D Manipulator, also works in 3D views.
*
* \brief Single click button action for use in manipulator groups.
*
- * Note: currently only very basic icon buttons supported.
+ * \note Currently only basic icon & vector-shape buttons are supported.
+ *
*/
#include "MEM_guardedalloc.h"
diff --git a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
index e9c7ff0c47d..0f7df8fe6aa 100644
--- a/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
+++ b/source/blender/editors/space_view3d/view3d_manipulator_navigate.c
@@ -73,6 +73,7 @@ enum {
MPR_TOTAL = 6,
};
+/* Vector icons compatible with 'GPU_batch_from_poly_2d_encoded' */
static const uchar shape_camera[] = {
0xa3, 0x19, 0x78, 0x55, 0x4d, 0x19, 0x4f, 0x0a, 0x7f, 0x00, 0xb0, 0x0a,
0xa9, 0x19,
0xa9, 0x19, 0x25, 0xda, 0x0a, 0xb0, 0x00, 0x7f, 0x0a, 0x4f, 0x25, 0x25,
0x4f, 0x0a,
diff --git a/source/blender/gpu/intern/gpu_batch.c
b/source/blender/gpu/intern/gpu_batch.c
index c74f367c447..deee84e92cb 100644
--- a/source/blender/gpu/intern/gpu_batch.c
+++ b/source/blender/gpu/intern/gpu_batch.c
@@ -57,6 +57,11 @@ void GWN_batch_program_set_builtin(Gwn_Batch *batch,
GPUBuiltinShader shader_id)
/** \name Batch Creation
* \{ */
+/**
+ * Creates triangles from a byte-array of polygons.
+ *
+ * See 'make_shape_2d_from_blend.py' utility to create data to pass to this
function.
+ */
Gwn_Batch *GPU_batch_from_poly_2d_encoded(
const uchar *polys_flat, uint polys_flat_len, float min, float max)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
