archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

OpenGL immediate mode: drawarmature.c (end)

Browse Source 
No deprecated call left.
This commit is contained in:
Clément Foucault
2017-02-14 00:34:52 +01:00
parent 22df54acb6
commit 7fc632a856
3 changed files with 288 additions and 286 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/blender/editors/space_view3d/drawarmature.c
+273 -283
View File
File diff suppressed because it is too large Load Diff
source/blender/editors/space_view3d/drawobject.c
+14 -2
View File
@@ -8551,8 +8551,18 @@ void draw_object(Scene *scene, SceneLayer *sl, ARegion *ar, View3D *v3d, Base *b
draw_bounding_volume(ob, ob->boundtype);
}
else {
unsigned char arm_col[4];
glLineWidth(1.0f);
empty_object = draw_armature(scene, sl, v3d, ar, base, dt, dflag, ob_wire_col, false);
if (ob_wire_col == NULL) {
float fcol[4];
glGetFloatv(GL_CURRENT_COLOR, fcol);
rgba_float_to_uchar(arm_col, fcol);
}
else
copy_v4_v4_uchar(arm_col, ob_wire_col);
empty_object = draw_armature(scene, sl, v3d, ar, base, dt, dflag, arm_col, false);
}
}
break;
@@ -9280,11 +9290,13 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r
if (dm) dm->release(dm);
}
void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, const char dt, int outline)
void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *ob, const char dt, int outline, float wire_col[4])
{
if (ob == NULL)
return;
glColor4fv(wire_col);
switch (ob->type) {
case OB_MESH:
draw_object_mesh_instance(scene, v3d, rv3d, ob, dt, outline);
source/blender/editors/space_view3d/view3d_intern.h
+1 -1
View File
@@ -148,7 +148,7 @@ void draw_object(Scene *scene, struct SceneLayer *sl, struct ARegion *ar, View3D
void draw_mesh_object_outline(View3D *v3d, Object *ob, struct DerivedMesh *dm);
bool draw_glsl_material(Scene *scene, struct Object *ob, View3D *v3d, const char dt);
void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const char dt, int outline);
void draw_object_instance(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob, const char dt, int outline, float wire_col[4]);
void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, struct Object *ob);
void draw_object_wire_color(Scene *scene, struct SceneLayer *, Base *base, unsigned char r_ob_wire_col[4]);