[Bf-blender-cvs] [82a94d0f848] blender2.8: Cleanup: correct names
Campbell Barton
noreply at git.blender.org
Sun Jan 14 07:45:29 CET 2018
Commit: 82a94d0f848ba7adcd5c68dc0796623697c74ad1
Author: Campbell Barton
Date: Sun Jan 14 17:54:27 2018 +1100
Branches: blender2.8
https://developer.blender.org/rB82a94d0f848ba7adcd5c68dc0796623697c74ad1
Cleanup: correct names
===================================================================
M source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.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 cad97a9ef03..3634e3d62ec 100644
--- a/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
+++ b/source/blender/editors/manipulator_library/manipulator_types/button2d_manipulator.c
@@ -62,13 +62,11 @@
#include "../manipulator_geometry.h"
#include "../manipulator_library_intern.h"
-typedef struct ButtonManipulator3D {
+typedef struct ButtonManipulator2D {
wmManipulator manipulator;
- /* Added to 'matrix_basis' when calculating the matrix. */
- float prop_co[3];
-} ButtonManipulator3D;
+} ButtonManipulator2D;
-#define DIAL_RESOLUTION 32
+#define CIRCLE_RESOLUTION 32
/* -------------------------------------------------------------------- */
@@ -85,7 +83,7 @@ static void button_geom_draw(
immUniformColor4fv(color);
/* TODO, other draw styles */
- imm_draw_circle_fill_2d(pos, 0, 0, 1.0f, DIAL_RESOLUTION);
+ imm_draw_circle_fill_2d(pos, 0, 0, 1.0f, CIRCLE_RESOLUTION);
immUnbindProgram();
@@ -184,7 +182,7 @@ static void MANIPULATOR_WT_button_2d(wmManipulatorType *wt)
wt->test_select = manipulator_button_test_select;
wt->cursor_get = manipulator_button_cursor_get;
- wt->struct_size = sizeof(ButtonManipulator3D);
+ wt->struct_size = sizeof(ButtonManipulator2D);
/* rna */
PropertyRNA *prop;
More information about the Bf-blender-cvs
mailing list