Merge branch 'master' into UI-graphical-redesignUI-graphical-redesign

Conflicts:
	source/blender/blenkernel/BKE_blender.h
	source/blender/blenloader/intern/versioning_270.c
	source/blender/editors/interface/interface.c
	source/blender/editors/interface/interface_handlers.c
	source/blender/editors/interface/interface_intern.h
	source/blender/editors/interface/resources.c

1 files changed, 8 insertions, 4 deletions

diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c
index fc028a46b78..65175e37518 100644
--- a/source/blender/makesrna/intern/rna_curve.c
+++ b/source/blender/makesrna/intern/rna_curve.c
@@ -34,7 +34,7 @@
 #include "BLI_utildefines.h"
 #include "BLI_math.h"
 
-#include "BLF_translation.h"
+#include "BLT_translation.h"
 
 #include "BKE_font.h"
 
@@ -385,6 +385,7 @@ static void rna_Curve_bevelObject_set(PointerRNA *ptr, PointerRNA value)
 		/* set as bevobj, there could be infinity loop in displist calculation */
 		if (ob->type == OB_CURVE && ob->data != cu) {
 			cu->bevobj = ob;
+			id_lib_extern((ID *)ob);
 		}
 	}
 	else {
@@ -427,6 +428,7 @@ static void rna_Curve_taperObject_set(PointerRNA *ptr, PointerRNA value)
 		/* set as bevobj, there could be infinity loop in displist calculation */
 		if (ob->type == OB_CURVE && ob->data != cu) {
 			cu->taperobj = ob;
+			id_lib_extern((ID *)ob);
 		}
 	}
 	else {
@@ -747,11 +749,12 @@ static int rna_Curve_is_editmode_get(PointerRNA *ptr)
 
 #else
 
+static const float tilt_limit = DEG2RADF(21600.0f);
+
 static void rna_def_bpoint(BlenderRNA *brna)
 {
 	StructRNA *srna;
 	PropertyRNA *prop;
-	const float tilt_limit = DEG2RADF(21600.0f);
 
 	srna = RNA_def_struct(brna, "SplinePoint", NULL);
 	RNA_def_struct_sdna(srna, "BPoint");
@@ -785,7 +788,7 @@ static void rna_def_bpoint(BlenderRNA *brna)
 	prop = RNA_def_property(srna, "tilt", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "alfa");
 	RNA_def_property_range(prop, -tilt_limit, tilt_limit);
-	RNA_def_property_ui_range(prop, -tilt_limit, tilt_limit, 0.1, 3);
+	RNA_def_property_ui_range(prop, -tilt_limit, tilt_limit, 10, 3);
 	RNA_def_property_ui_text(prop, "Tilt", "Tilt in 3D View");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");
 
@@ -872,7 +875,8 @@ static void rna_def_beztriple(BlenderRNA *brna)
 	/* Number values */
 	prop = RNA_def_property(srna, "tilt", PROP_FLOAT, PROP_ANGLE);
 	RNA_def_property_float_sdna(prop, NULL, "alfa");
-	/*RNA_def_property_range(prop, -FLT_MAX, FLT_MAX);*/
+	RNA_def_property_range(prop, -tilt_limit, tilt_limit);
+	RNA_def_property_ui_range(prop, -tilt_limit, tilt_limit, 10, 3);
 	RNA_def_property_ui_text(prop, "Tilt", "Tilt in 3D View");
 	RNA_def_property_update(prop, 0, "rna_Curve_update_data");