[Bf-blender-cvs] [1b1be15] temp_manipulators_core: Cleanup: Rename manipulator_draw_intern->manipulator_drawinfo_draw

[Julian Eisel]

Commit: 1b1be1576a85a2088008e06cca44e9254d5d4b17
Author: Julian Eisel
Date:   Wed Sep 14 14:53:46 2016 +0200
Branches: temp_manipulators_core
https://developer.blender.org/rB1b1be1576a85a2088008e06cca44e9254d5d4b17

Cleanup: Rename manipulator_draw_intern->manipulator_drawinfo_draw

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

M       
source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
M       
source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
M       source/blender/windowmanager/manipulators/intern/wm_manipulator.c
M       source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h

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

diff --git 
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
 
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
index 7afaa66..9624014 100644
--- 
a/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
+++ 
b/source/blender/windowmanager/manipulators/intern/manipulator_library/arrow_manipulator.c
@@ -133,7 +133,7 @@ static void arrow_draw_geom(const ArrowManipulator *arrow, 
const bool select)
        }
        else {
 #ifdef MANIPULATOR_USE_CUSTOM_ARROWS
-               manipulator_draw_intern(&arrow_head_draw_info, select);
+               manipulator_drawinfo_draw(&arrow_head_draw_info, select);
 #else
                const float vec[2][3] = {
                        {0.0f, 0.0f, 0.0f},
@@ -161,7 +161,7 @@ static void arrow_draw_geom(const ArrowManipulator *arrow, 
const bool select)
                        glScalef(size, size, size);
 
                        /* draw cube */
-                       manipulator_draw_intern(&cube_draw_info, select);
+                       manipulator_drawinfo_draw(&cube_draw_info, select);
                }
                else {
                        const float len = 0.25f;
diff --git 
a/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
 
b/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
index 50f452b..76d88ff 100644
--- 
a/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
+++ 
b/source/blender/windowmanager/manipulators/intern/manipulator_library/dial_manipulator.c
@@ -90,7 +90,7 @@ typedef struct DialInteraction {
 static void dial_geom_draw(const DialManipulator *dial, const float col[4], 
const bool select)
 {
 #ifdef MANIPULATOR_USE_CUSTOM_DIAS
-       manipulator_draw_intern(&dial_draw_info, select);
+       manipulator_drawinfo_draw(&dial_draw_info, select);
 #else
        const bool filled = (dial->style == MANIPULATOR_DIAL_STYLE_RING_FILLED);
 
diff --git a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c 
b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
index d15ce68..60c73fd 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator.c
@@ -53,7 +53,7 @@
 /**
  * Main draw call for ManipulatorDrawInfo data
  */
-void manipulator_draw_intern(ManipulatorDrawInfo *info, const bool select)
+void manipulator_drawinfo_draw(ManipulatorDrawInfo *info, const bool select)
 {
        GLuint buf[3];
 
diff --git 
a/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h 
b/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
index a23d6f2..c50b492 100644
--- a/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
+++ b/source/blender/windowmanager/manipulators/intern/wm_manipulator_intern.h
@@ -110,7 +110,7 @@ typedef struct ManipulatorDrawInfo {
        bool init;
 } ManipulatorDrawInfo;
 
-void manipulator_draw_intern(ManipulatorDrawInfo *info, const bool select);
+void manipulator_drawinfo_draw(ManipulatorDrawInfo *info, const bool select);
 
 #endif  /* __WM_MANIPULATOR_INTERN_H__ */

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