diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 07:05:11 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-10 07:05:11 +0400 |
| commit | 685041d53a5a86c6c30fff6995a3873c4fb7d0af (patch) | |
| tree | 5d671082efe0eee7645f34da3c3c793747eaafa8 /source/blender/editors/include/ED_uvedit.h | |
| parent | ee1828be191e31c00820a25488acfca61f66e5bd (diff) | |
| parent | 28ee0f92184af8ba6f44d08eda23ce5eb3815697 (diff) | |
svn merge -r41650:41655 ^/trunk/blender --- cycles merge, this wont copile, still need to manually update some funcs
Diffstat (limited to 'source/blender/editors/include/ED_uvedit.h')
| -rw-r--r-- | source/blender/editors/include/ED_uvedit.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/source/blender/editors/include/ED_uvedit.h b/source/blender/editors/include/ED_uvedit.h index 44c5113413d..2f193292eec 100644 --- a/source/blender/editors/include/ED_uvedit.h +++ b/source/blender/editors/include/ED_uvedit.h @@ -33,10 +33,14 @@ struct ARegionType; struct EditFace; struct Image; +struct Main; +struct ImageUser; struct MTFace; struct Object; struct Scene; +struct SpaceImage; struct bContext; +struct bNode; struct wmKeyConfig; struct BMEditMesh; struct BMLoop; @@ -47,9 +51,12 @@ struct MTexPoly; void ED_operatortypes_uvedit(void); void ED_keymap_uvedit(struct wmKeyConfig *keyconf); -void ED_uvedit_assign_image(struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma); +void ED_uvedit_assign_image(struct Main *bmain, struct Scene *scene, struct Object *obedit, struct Image *ima, struct Image *previma); int ED_uvedit_minmax(struct Scene *scene, struct Image *ima, struct Object *obedit, float *min, float *max); +int ED_object_get_active_image(struct Object *ob, int mat_nr, struct Image **ima, struct ImageUser **iuser, struct bNode **node); +void ED_object_assign_active_image(struct Main *bmain, struct Object *ob, int mat_nr, struct Image *ima); + int ED_uvedit_test_silent(struct Object *obedit); int ED_uvedit_test(struct Object *obedit); |