Merged changes in the trunk up to revision 41638.

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/BKE_main.h
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/include/UI_resources.h
source/blender/editors/interface/resources.c
source/blender/makesdna/DNA_ID.h
source/blender/makesdna/intern/makesdna.c
source/blender/makesrna/intern/rna_internal.h
source/blender/makesrna/intern/rna_main.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_scene.c

1 files changed, 13 insertions, 12 deletions

diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index b24d914fa0d..8778a34b4f7 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -176,19 +176,20 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
 	/* helper macro for use here to try and get the path 
 	 *	- this calls the standard code for getting a path to a texture...
 	 */
-#define COLRAMP_GETPATH \
-{ \
-prop= RNA_struct_find_property(&ramp_ptr, "elements"); \
-if (prop) { \
-index= RNA_property_collection_lookup_index(&ramp_ptr, prop, ptr); \
-if (index >= 0) { \
-char *texture_path= rna_ColorRamp_path(&ramp_ptr); \
-path= BLI_sprintfN("%s.elements[%d]", texture_path, index); \
-MEM_freeN(texture_path); \
-} \
-} \
+
+#define COLRAMP_GETPATH                                                       \
+{                                                                             \
+	prop= RNA_struct_find_property(&ramp_ptr, "elements");                    \
+	if (prop) {                                                               \
+		index= RNA_property_collection_lookup_index(&ramp_ptr, prop, ptr);    \
+		if (index >= 0) {                                                     \
+			char *texture_path= rna_ColorRamp_path(&ramp_ptr);                \
+			path= BLI_sprintfN("%s.elements[%d]", texture_path, index);       \
+			MEM_freeN(texture_path);                                          \
+		}                                                                     \
+	}                                                                         \
 }
-	
+
 	/* determine the path from the ID-block to the ramp */
 	// FIXME: this is a very slow way to do it, but it will have to suffice...
 	if (ptr->id.data) {