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

Merge branch 'master' into blender2.8

Browse Source 
Conflicts:
	source/blender/blenkernel/BKE_sequencer.h
	source/blender/blenkernel/intern/sequencer.c
	source/blender/editors/curve/editcurve_paint.c
	source/blender/editors/gpencil/gpencil_edit.c
	source/blender/editors/gpencil/gpencil_paint.c
	source/blender/editors/gpencil/gpencil_utils.c
	source/blender/editors/include/ED_object.h
	source/blender/editors/include/ED_view3d.h
	source/blender/editors/interface/interface_eyedropper_depth.c
	source/blender/editors/render/render_opengl.c
	source/blender/editors/sculpt_paint/paint_image_proj.c
	source/blender/editors/sculpt_paint/sculpt.c
	source/blender/editors/space_view3d/drawobject.c
	source/blender/editors/space_view3d/view3d_draw.c
	source/blender/editors/space_view3d/view3d_edit.c
	source/blender/editors/space_view3d/view3d_intern.h
	source/blender/editors/space_view3d/view3d_select.c
	source/blender/editors/space_view3d/view3d_utils.c
	source/blender/editors/transform/transform_conversions.c
	source/blender/editors/transform/transform_snap.c
	source/blender/python/intern/gpu_offscreen.c
	source/blender/windowmanager/intern/wm_files.c
This commit is contained in:
Bastien Montagne
2018-06-08 14:38:57 +02:00
parent ae3e59fb61 7b6af843c2
commit 94aa4d1657
29 changed files with 102 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/editors/interface/interface.c
View File

@@ -53,10 +53,11 @@
#include "BKE_animsys.h"
#include "BKE_context.h"
#include "BKE_unit.h"
#include "BKE_idprop.h"
#include "BKE_main.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
#include "BKE_idprop.h"
#include "BKE_unit.h"
#include "GPU_glew.h"
#include "GPU_matrix.h"
@@ -4694,10 +4695,10 @@ void UI_init(void)
}
/* after reading userdef file */
void UI_init_userdef(void)
void UI_init_userdef(Main *bmain)
{
/* fix saved themes */
init_userdef_do_versions();
init_userdef_do_versions(bmain);
uiStyleInit();
}