Commit: 9aa36de62cddbb74feb1c81a245d4dc6639478e6 Author: Campbell Barton Date: Fri Mar 31 20:41:46 2017 +1100 Branches: custom-manipulators https://developer.blender.org/rB9aa36de62cddbb74feb1c81a245d4dc6639478e6
Merge branch 'blender2.8' into custom-manipulators =================================================================== =================================================================== diff --cc source/blender/editors/include/ED_view3d.h index 7643cacda51,e8944f1e654..38ace785f96 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@@ -338,10 -335,9 +339,11 @@@ void ED_view3d_check_mats_rv3d(struct R #endif int ED_view3d_scene_layer_set(int lay, const int *values, int *active); - void *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d); - void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, void *rv3dmat_pt); + struct RV3DMatrixStore *ED_view3d_mats_rv3d_backup(struct RegionView3D *rv3d); + void ED_view3d_mats_rv3d_restore(struct RegionView3D *rv3d, struct RV3DMatrixStore *rv3dmat); + +void ED_draw_object_facemap(struct Scene *scene, struct Object *ob, const float col[4], const int facemap); + bool ED_view3d_context_activate(struct bContext *C); void ED_view3d_draw_offscreen_init(struct Scene *scene, struct SceneLayer *sl, struct View3D *v3d); void ED_view3d_draw_offscreen( _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs
