Merge branch 'master' into blender2.8

8 files changed, 35 insertions, 33 deletions

diff --git a/source/blender/makesrna/intern/makesrna.c b/source/blender/makesrna/intern/makesrna.c
index fbdb8abd3b0..f2352052800 100644
--- a/source/blender/makesrna/intern/makesrna.c
+++ b/source/blender/makesrna/intern/makesrna.c
@@ -49,8 +49,8 @@
 /**
  * Variable to control debug output of makesrna.
  * debugSRNA:
- *  - 0 = no output, except errors
- *  - 1 = detail actions
+ * - 0 = no output, except errors
+ * - 1 = detail actions
  */
 static int debugSRNA = 0;
 
diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index 3cf959eaee1..fded3d32cc1 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -218,7 +218,7 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
 	int index;
 
 	/* helper macro for use here to try and get the path
-	 *	- this calls the standard code for getting a path to a texture...
+	 * - this calls the standard code for getting a path to a texture...
 	 */
 
 #define COLRAMP_GETPATH                                                       \
diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c
index 209860e26c6..d24be434ea1 100644
--- a/source/blender/makesrna/intern/rna_dynamicpaint.c
+++ b/source/blender/makesrna/intern/rna_dynamicpaint.c
@@ -94,7 +94,7 @@ static char *rna_DynamicPaintSurface_path(PointerRNA *ptr)
 
 
 /*
- *	Surfaces
+ * Surfaces
  */
 
 static void rna_DynamicPaint_redoModifier(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
@@ -511,7 +511,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_OBJECT | ND_MODIFIER, "rna_DynamicPaint_redoModifier");
 
 	/*
-	 *	Initial Color
+	 * Initial Color
 	 */
 
 	prop = RNA_def_property(srna, "init_color_type", PROP_ENUM, PROP_NONE);
@@ -536,7 +536,7 @@ static void rna_def_canvas_surface(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_MATERIAL | ND_SHADING_DRAW | ND_MODIFIER, "rna_DynamicPaintSurface_reset");
 
 	/*
-	 *   Effect Settings
+	 * Effect Settings
 	 */
 	prop = RNA_def_property(srna, "effect_ui", PROP_ENUM, PROP_NONE);
 	RNA_def_property_clear_flag(prop, PROP_ANIMATABLE);
@@ -756,7 +756,7 @@ static void rna_def_dynamic_paint_canvas_settings(BlenderRNA *brna)
 	RNA_def_struct_path_func(srna, "rna_DynamicPaintCanvasSettings_path");
 
 	/*
-	 *	Surface Slots
+	 * Surface Slots
 	 */
 	prop = RNA_def_property(srna, "canvas_surfaces", PROP_COLLECTION, PROP_NONE);
 	RNA_def_property_collection_funcs(prop, "rna_DynamicPaint_surfaces_begin", "rna_iterator_listbase_next",
diff --git a/source/blender/makesrna/intern/rna_fcurve.c b/source/blender/makesrna/intern/rna_fcurve.c
index 7b714bef186..b4715075624 100644
--- a/source/blender/makesrna/intern/rna_fcurve.c
+++ b/source/blender/makesrna/intern/rna_fcurve.c
@@ -111,8 +111,10 @@ static StructRNA *rna_FModifierType_refine(struct PointerRNA *ptr)
 			return &RNA_FModifierCycles;
 		case FMODIFIER_TYPE_NOISE:
 			return &RNA_FModifierNoise;
-		/*case FMODIFIER_TYPE_FILTER: */
-		/*	return &RNA_FModifierFilter; */
+#if 0
+		case FMODIFIER_TYPE_FILTER:
+			return &RNA_FModifierFilter;
+#endif
 		case FMODIFIER_TYPE_PYTHON:
 			return &RNA_FModifierPython;
 		case FMODIFIER_TYPE_LIMITS:
@@ -1058,8 +1060,8 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna)
 	RNA_def_struct_sdna(srna, "FCM_EnvelopeData");
 
 	/* min/max extents
-	 *	- for now, these are allowed to go past each other, so that we can have inverted action
-	 *	- technically, the range is limited by the settings in the envelope-modifier data, not here...
+	 * - for now, these are allowed to go past each other, so that we can have inverted action
+	 * - technically, the range is limited by the settings in the envelope-modifier data, not here...
 	 */
 	prop = RNA_def_property(srna, "min", PROP_FLOAT, PROP_NONE);
 	RNA_def_property_float_sdna(prop, NULL, "min");
@@ -1078,7 +1080,7 @@ static void rna_def_fmodifier_envelope_ctrl(BlenderRNA *brna)
 	RNA_def_property_update(prop, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, "rna_FModifier_update");
 
 	/* TODO: */
-	/*	- selection flags (not implemented in UI yet though) */
+	/* - selection flags (not implemented in UI yet though) */
 }
 
 static void rna_def_fmodifier_envelope_control_points(BlenderRNA *brna, PropertyRNA *cprop)
@@ -1603,7 +1605,7 @@ static void rna_def_drivervar(BlenderRNA *brna)
 static void rna_def_channeldriver_variables(BlenderRNA *brna, PropertyRNA *cprop)
 {
 	StructRNA *srna;
-/*	PropertyRNA *prop; */
+	/* PropertyRNA *prop; */
 
 	FunctionRNA *func;
 	PropertyRNA *parm;
diff --git a/source/blender/makesrna/intern/rna_key.c b/source/blender/makesrna/intern/rna_key.c
index a8d6246e169..ed1e0d2690e 100644
--- a/source/blender/makesrna/intern/rna_key.c
+++ b/source/blender/makesrna/intern/rna_key.c
@@ -520,7 +520,7 @@ static KeyBlock *rna_ShapeKeyData_find_keyblock(Key *key, float *point)
 			}
 
 			/* determine where end of array is
-			 *	- elemsize is in bytes, so use (char *) cast to get array in terms of bytes
+			 * - elemsize is in bytes, so use (char *) cast to get array in terms of bytes
 			 */
 			end = (float *)((char *)start + (key->elemsize * kb->totelem));
 
diff --git a/source/blender/makesrna/intern/rna_nla.c b/source/blender/makesrna/intern/rna_nla.c
index 444438a230c..121a21293f0 100644
--- a/source/blender/makesrna/intern/rna_nla.c
+++ b/source/blender/makesrna/intern/rna_nla.c
@@ -145,11 +145,11 @@ static void rna_NlaStrip_start_frame_set(PointerRNA *ptr, float value)
 	NlaStrip *data = (NlaStrip *)ptr->data;
 
 	/* clamp value to lie within valid limits
-	 *	- cannot start past the end of the strip + some flexibility threshold
-	 *	- cannot start before the previous strip (if present) ends
-	 *		-> but if it was a transition, we could go up to the start of the strip + some flexibility threshold
-	 *		as long as we re-adjust the transition afterwards
-	 *	- minimum frame is -MAXFRAME so that we don't get clipping on frame 0
+	 * - cannot start past the end of the strip + some flexibility threshold
+	 * - cannot start before the previous strip (if present) ends
+	 *   -> but if it was a transition, we could go up to the start of the strip + some flexibility threshold
+	 *   as long as we re-adjust the transition afterwards
+	 * - minimum frame is -MAXFRAME so that we don't get clipping on frame 0
 	 */
 	if (data->prev) {
 		if (data->prev->type == NLASTRIP_TYPE_TRANSITION) {
@@ -173,11 +173,11 @@ static void rna_NlaStrip_end_frame_set(PointerRNA *ptr, float value)
 	NlaStrip *data = (NlaStrip *)ptr->data;
 
 	/* clamp value to lie within valid limits
-	 *	- must not have zero or negative length strip, so cannot start before the first frame
-	 *	  + some minimum-strip-length threshold
-	 *	- cannot end later than the start of the next strip (if present)
-	 *		-> but if it was a transition, we could go up to the start of the end - some flexibility threshold
-	 *		as long as we re-adjust the transition afterwards
+	 * - must not have zero or negative length strip, so cannot start before the first frame
+	 *   + some minimum-strip-length threshold
+	 * - cannot end later than the start of the next strip (if present)
+	 *   -> but if it was a transition, we could go up to the start of the end - some flexibility threshold
+	 *   as long as we re-adjust the transition afterwards
 	 */
 	if (data->next) {
 		if (data->next->type == NLASTRIP_TYPE_TRANSITION) {
@@ -399,7 +399,7 @@ static NlaStrip *rna_NlaStrip_new(ID *id, NlaTrack *track, Main *bmain, bContext
 
 	/* create dummy AnimData block so that BKE_nlastrip_validate_name()
 	 * can be used to ensure a valid name, as we don't have one here...
-	 *  - only the nla_tracks list is needed there, which we aim to reverse engineer here...
+	 * - only the nla_tracks list is needed there, which we aim to reverse engineer here...
 	 */
 	{
 		AnimData adt = {NULL};
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index b9876d8595f..e0ebe1c29c8 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -828,8 +828,8 @@ static void rna_Scene_active_keying_set_set(PointerRNA *ptr, PointerRNA value)
 }
 
 /* get KeyingSet index stuff for list of Keying Sets editing UI
- *	- active_keyingset-1 since 0 is reserved for 'none'
- *	- don't clamp, otherwise can never set builtins types as active...
+ * - active_keyingset-1 since 0 is reserved for 'none'
+ * - don't clamp, otherwise can never set builtins types as active...
  */
 static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr)
 {
@@ -838,7 +838,7 @@ static int rna_Scene_active_keying_set_index_get(PointerRNA *ptr)
 }
 
 /* get KeyingSet index stuff for list of Keying Sets editing UI
- *	- value+1 since 0 is reserved for 'none'
+ * - value+1 since 0 is reserved for 'none'
  */
 static void rna_Scene_active_keying_set_index_set(PointerRNA *ptr, int value)
 {
diff --git a/source/blender/makesrna/intern/rna_space.c b/source/blender/makesrna/intern/rna_space.c
index 6db4aa5b404..daff33f40db 100644
--- a/source/blender/makesrna/intern/rna_space.c
+++ b/source/blender/makesrna/intern/rna_space.c
@@ -1560,21 +1560,21 @@ static void rna_SpaceDopeSheetEditor_mode_update(bContext *C, PointerRNA *ptr)
 	if (saction->mode == SACTCONT_SHAPEKEY) {
 		Key *key = BKE_key_from_object(obact);
 
-		/* 1)	update the action stored for the editor */
+		/* 1) update the action stored for the editor */
 		if (key)
 			saction->action = (key->adt) ? key->adt->action : NULL;
 		else
 			saction->action = NULL;
 
-		/* 2)	enable 'show sliders' by default, since one of the main
-		 *		points of the ShapeKey Editor is to provide a one-stop shop
-		 *		for controlling the shapekeys, whose main control is the value
+		/* 2) enable 'show sliders' by default, since one of the main
+		 *    points of the ShapeKey Editor is to provide a one-stop shop
+		 *    for controlling the shapekeys, whose main control is the value
 		 */
 		saction->flag |= SACTION_SLIDERS;
 	}
 	/* make sure action stored is valid */
 	else if (saction->mode == SACTCONT_ACTION) {
-		/* 1)	update the action stored for the editor */
+		/* 1) update the action stored for the editor */
 		/* TODO: context selector could help decide this with more control? */
 		if (obact)
 			saction->action = (obact->adt) ? obact->adt->action : NULL;