Commit: c5ede37a9e936fa0971385e18b4a47274f51c991
Author: Antony Riakiotakis
Date: Mon Jan 5 12:24:47 2015 +0100
Branches: gooseberry
https://developer.blender.org/rBc5ede37a9e936fa0971385e18b4a47274f51c991
Merge branch 'wiggly-widgets' into gooseberry
Conflicts:
source/blender/makesrna/intern/rna_object.c
source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
===================================================================
diff --cc source/blender/editors/include/ED_view3d.h
index 7808861,a629504..358bda7
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -308,10 -305,12 +308,12 @@@ void ED_view3d_check_mats_rv3d(struct R
#endif
int ED_view3d_scene_layer_set(int lay, const int *values, int *active);
+ void ED_draw_object_facemap(struct Scene *scene, struct Object *ob, int
facemap);
+
bool ED_view3d_context_activate(struct bContext *C);
void ED_view3d_draw_offscreen_init(struct Scene *scene, struct View3D *v3d);
-void ED_view3d_draw_offscreen(struct Scene *scene, struct View3D *v3d, struct
ARegion *ar,
- int winx, int winy, float viewmat[4][4], float
winmat[4][4], bool do_bgpic, bool do_sky);
+void ED_view3d_draw_offscreen(struct Scene *scene, struct View3D *v3d, struct
ARegion *ar, int winx, int winy, float viewmat[4][4],
+ float winmat[4][4], bool do_bgpic, bool do_sky,
struct GPUFX *fx, bool is_persp, struct GPUOffScreen *ofs, struct GPUFXOptions
*fxoptions, int fxflags);
struct ImBuf *ED_view3d_draw_offscreen_imbuf(struct Scene *scene, struct
View3D *v3d, struct ARegion *ar, int sizex, int sizey, unsigned int flag,
bool draw_background, int
alpha_mode, char err_out[256]);
diff --cc source/blender/makesrna/intern/rna_object.c
index 28bcac0,59e409e..38aaf11
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@@ -42,7 -42,7 +42,8 @@@
#include "BLI_utildefines.h"
#include "BLI_listbase.h"
+#include "BKE_camera.h"
+ #include "BKE_facemap.h"
#include "BKE_paint.h"
#include "BKE_editmesh.h"
#include "BKE_group.h" /* needed for BKE_group_object_exists() */
diff --cc source/blenderplayer/bad_level_call_stubs/stubs.c
index 84a6ee8,fb0baa1..9cbed88
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@@ -312,12 -299,13 +300,12 @@@ void WM_cursor_time(struct wmWindow *wi
void WM_cursor_warp(struct wmWindow *win, int x, int y) RET_NONE
void WM_widgetmap_delete(struct wmWidgetMap *wmap) RET_NONE
- struct wmWidgetMapType *WM_widgetmaptype_find(const char *idname, int
spaceid, int regionid, bool is_3d, bool create) RET_NULL;
+ struct wmWidgetMapType *WM_widgetmaptype_find(const char *idname, int
spaceid, int regionid, bool is_3d, bool create) RET_NULL
struct wmWidgetGroupType *WM_widgetgrouptype_new(int (*poll)(const struct
bContext *, struct wmWidgetGroupType *),
- void (*draw)(const struct
bContext *, struct wmWidgetGroup *),
- struct Main *bmain, const
char *mapidname, short spaceid, short regionid, bool is_3d) RET_NULL;
- void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain,
struct wmWidgetGroupType *wgroup) RET_NONE;
+ void (*draw)(const struct
bContext *, struct wmWidgetGroup *),
+ struct Main *bmain, const
char *mapidname, short spaceid, short regionid, bool is_3d) RET_NULL
+ void WM_widgetgrouptype_unregister(struct bContext *C, struct Main *bmain,
struct wmWidgetGroupType *wgroup) RET_NONE
-
void WM_uilisttype_init(void) RET_NONE
struct uiListType *WM_uilisttype_find(const char *idname, bool quiet)
RET_NULL
bool WM_uilisttype_add(struct uiListType *ult) RET_ZERO
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
