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_group.h
	source/blender/blenkernel/BKE_object.h
	source/blender/blenkernel/intern/group.c
	source/blender/blenkernel/intern/library_remap.c
	source/blender/blenkernel/intern/object.c
	source/blender/blenloader/intern/readfile.c
	source/blender/editors/object/object_group.c
	source/blender/editors/object/object_relations.c
	source/blender/editors/physics/rigidbody_constraint.c
	source/blender/editors/physics/rigidbody_object.c
	source/blender/makesrna/intern/rna_group.c
This commit is contained in:
Bastien Montagne
2018-06-12 15:41:32 +02:00
parent 1b5e3e1c01 a6585fa4b1
commit 6231a077ac
7 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/curve.c
View File

@@ -4962,7 +4962,7 @@ bool BKE_curve_minmax(Curve *cu, bool use_radius, float min[3], float max[3])
*/
if (is_font) {
nurb_lb = &temp_nurb_lb;
BKE_vfont_to_curve_ex(G.main, NULL, cu, FO_EDIT, nurb_lb,
BKE_vfont_to_curve_ex(NULL, cu, FO_EDIT, nurb_lb,
NULL, NULL, NULL, NULL);
use_radius = false;
}