Commit: aeeebacd6a2ac6abbfe10af65c94923c39de754b
Author: Campbell Barton
Date:   Sat Jun 17 10:04:48 2017 +1000
Branches: blender2.8
https://developer.blender.org/rBaeeebacd6a2ac6abbfe10af65c94923c39de754b

Cleanup: minor consistency tweak for type name

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

M       source/blender/editors/manipulator_library/primitive3d_manipulator.c
M       source/blender/editors/transform/transform_manipulator.c

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

diff --git 
a/source/blender/editors/manipulator_library/primitive3d_manipulator.c 
b/source/blender/editors/manipulator_library/primitive3d_manipulator.c
index 0f715501794..03e8da0e8d4 100644
--- a/source/blender/editors/manipulator_library/primitive3d_manipulator.c
+++ b/source/blender/editors/manipulator_library/primitive3d_manipulator.c
@@ -239,10 +239,10 @@ void 
ED_manipulator_primitive3d_set_up_vector(wmManipulator *mpr, const float di
        }
 }
 
-static void MANIPULATOR_WT_primitive3d(wmManipulatorType *wt)
+static void MANIPULATOR_WT_primitive_3d(wmManipulatorType *wt)
 {
        /* identifiers */
-       wt->idname = "MANIPULATOR_WT_primitive3d";
+       wt->idname = "MANIPULATOR_WT_primitive_3d";
 
        /* api callbacks */
        wt->draw = manipulator_primitive_draw;
@@ -255,7 +255,7 @@ static void MANIPULATOR_WT_primitive3d(wmManipulatorType 
*wt)
 
 void ED_manipulatortypes_primitive_3d(void)
 {
-       WM_manipulatortype_append(MANIPULATOR_WT_primitive3d);
+       WM_manipulatortype_append(MANIPULATOR_WT_primitive_3d);
 }
 
 /** \} */ // Primitive Manipulator API
diff --git a/source/blender/editors/transform/transform_manipulator.c 
b/source/blender/editors/transform/transform_manipulator.c
index 4eeca3967cd..6b6e68987f9 100644
--- a/source/blender/editors/transform/transform_manipulator.c
+++ b/source/blender/editors/transform/transform_manipulator.c
@@ -1088,7 +1088,7 @@ static ManipulatorGroup 
*manipulatorgroup_init(wmManipulatorGroup *mgroup)
 
        const wmManipulatorType *wt_arrow = 
WM_manipulatortype_find("MANIPULATOR_WT_arrow_3d", true);
        const wmManipulatorType *wt_dial = 
WM_manipulatortype_find("MANIPULATOR_WT_dial_3d", true);
-       const wmManipulatorType *wt_prim = 
WM_manipulatortype_find("MANIPULATOR_WT_primitive3d", true);
+       const wmManipulatorType *wt_prim = 
WM_manipulatortype_find("MANIPULATOR_WT_primitive_3d", true);
 
 #define MANIPULATOR_NEW_ARROW(v, name, style) { \
        v = WM_manipulator_new_ptr(wt_arrow, mgroup, name); \

_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs

Reply via email to