diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-19 01:45:29 +0400 |
| commit | 29b7b344fc48ed31b1e36818ab4767090691d6e2 (patch) | |
| tree | 2c7496c8c656565d2ac6dc0901e1af66f8565101 /source/blender/editors/include | |
| parent | c1ceab1281ccf061f03f8000bf190a082a5385d8 (diff) | |
| parent | 7bfef29f2f2a1b262d28abdc6e30fcd9c1f1caad (diff) | |
svn merge ^/trunk/blender -r55357:55372
Diffstat (limited to 'source/blender/editors/include')
| -rw-r--r-- | source/blender/editors/include/ED_image.h | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_view3d.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/include/ED_image.h b/source/blender/editors/include/ED_image.h index 9b726cea56c..11b8aa5e60a 100644 --- a/source/blender/editors/include/ED_image.h +++ b/source/blender/editors/include/ED_image.h @@ -79,7 +79,7 @@ int ED_space_image_maskedit_mask_poll(struct bContext *C); void ED_image_update_frame(const struct Main *mainp, int cfra); void ED_image_draw_info(struct Scene *scene, struct ARegion *ar, int color_manage, int use_default_view, int channels, int x, int y, - const unsigned char cp[4], const float fp[4], int *zp, float *zpf); + const unsigned char cp[4], const float fp[4], const float linearcol[4], int *zp, float *zpf); #endif /* __ED_IMAGE_H__ */ diff --git a/source/blender/editors/include/ED_view3d.h b/source/blender/editors/include/ED_view3d.h index 470bbe616cf..12afeb2d343 100644 --- a/source/blender/editors/include/ED_view3d.h +++ b/source/blender/editors/include/ED_view3d.h @@ -216,7 +216,7 @@ bool ED_view3d_viewplane_get(struct View3D *v3d, struct RegionView3D *rv3d, int struct rctf *r_viewplane, float *r_clipsta, float *r_clipend); void ED_view3d_calc_camera_border(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct RegionView3D *rv3d, - struct rctf *viewborder_r, const bool no_shift); + struct rctf *r_viewborder, const bool no_shift); void ED_view3d_calc_camera_border_size(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, struct RegionView3D *rv3d, float r_size[2]); @@ -244,7 +244,7 @@ unsigned int view3d_sample_backbuf_rect(struct ViewContext *vc, const int mval[2 unsigned int view3d_sample_backbuf(struct ViewContext *vc, int x, int y); /* draws and does a 4x4 sample */ -int ED_view3d_autodist(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, const int mval[2], float mouse_worldloc[3]); +int ED_view3d_autodist(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, const int mval[2], float mouse_worldloc[3], bool alphaoverride); /* only draw so ED_view3d_autodist_simple can be called many times after */ int ED_view3d_autodist_init(struct Scene *scene, struct ARegion *ar, struct View3D *v3d, int mode); @@ -268,7 +268,7 @@ int edge_inside_circle(const float cent[2], float radius, const float screen_co_ /* get 3d region from context, also if mouse is in header or toolbar */ struct RegionView3D *ED_view3d_context_rv3d(struct bContext *C); -int ED_view3d_context_user_region(struct bContext *C, struct View3D **v3d_r, struct ARegion **ar_r); +int ED_view3d_context_user_region(struct bContext *C, struct View3D **r_v3d, struct ARegion **r_ar); int ED_operator_rv3d_user_region_poll(struct bContext *C); void ED_view3d_init_mats_rv3d(struct Object *ob, struct RegionView3D *rv3d); |