[Bf-blender-cvs] [35bd833] blender2.8: Cleanup: Style
Julian Eisel
noreply at git.blender.org
Thu Sep 29 21:17:06 CEST 2016
Commit: 35bd833e02492ff89ab1e77ed1d96c9b6507646d
Author: Julian Eisel
Date: Thu Sep 29 21:15:27 2016 +0200
Branches: blender2.8
https://developer.blender.org/rB35bd833e02492ff89ab1e77ed1d96c9b6507646d
Cleanup: Style
===================================================================
M source/blender/editors/space_view3d/drawobject.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c
index 63db6c4..a5aeae9 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -2186,14 +2186,16 @@ static void drawcamera(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base *base
}
/* flag similar to draw_object() */
-static void drawspeaker(const unsigned char ob_wire_col[3]) {
+static void drawspeaker(const unsigned char ob_wire_col[3])
+{
VertexFormat *format = immVertexFormat();
- unsigned pos = add_attrib(format, "pos", GL_FLOAT, 3, KEEP_FLOAT);
+ unsigned int pos = add_attrib(format, "pos", GL_FLOAT, 3, KEEP_FLOAT);
immBindBuiltinProgram(GPU_SHADER_3D_UNIFORM_COLOR);
- if (ob_wire_col)
+ if (ob_wire_col) {
immUniformColor3ubv(ob_wire_col);
+ }
glLineWidth(1);
More information about the Bf-blender-cvs
mailing list