[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45518] trunk/blender/source/blender/ python/intern/bpy_rna.c: Fix #30698: python console nodetree paths were not accurate, now show ...

[Brecht Van Lommel]

Revision: 45518
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45518
Author:   blendix
Date:     2012-04-10 16:37:05 +0000 (Tue, 10 Apr 2012)
Log Message:
-----------
Fix #30698: python console nodetree paths were not accurate, now show ... like
in some other cases to at least show these are not accurate.

Modified Paths:
--------------
    trunk/blender/source/blender/python/intern/bpy_rna.c

Modified: trunk/blender/source/blender/python/intern/bpy_rna.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_rna.c	2012-04-10 16:28:26 UTC (rev 45517)
+++ trunk/blender/source/blender/python/intern/bpy_rna.c	2012-04-10 16:37:05 UTC (rev 45518)
@@ -871,10 +871,17 @@
 		const char *path;
 		path = RNA_path_from_ID_to_struct(&self->ptr);
 		if (path) {
-			ret = PyUnicode_FromFormat("bpy.data.%s[%R].%s",
-			                           BKE_idcode_to_name_plural(GS(id->name)),
-			                           tmp_str,
-			                           path);
+			if (GS(id->name) == ID_NT) { /* nodetree paths are not accurate */
+				ret = PyUnicode_FromFormat("bpy.data...%s",
+										   path);
+			}
+			else {
+				ret = PyUnicode_FromFormat("bpy.data.%s[%R].%s",
+				                           BKE_idcode_to_name_plural(GS(id->name)),
+				                           tmp_str,
+				                           path);
+			}
+
 			MEM_freeN((void *)path);
 		}
 		else { /* cant find, print something sane */
@@ -971,10 +978,17 @@
 
 	path = RNA_path_from_ID_to_property(&self->ptr, self->prop);
 	if (path) {
-		ret = PyUnicode_FromFormat("bpy.data.%s[%R].%s",
-		                           BKE_idcode_to_name_plural(GS(id->name)),
-		                           tmp_str,
-		                           path);
+		if (GS(id->name) == ID_NT) { /* nodetree paths are not accurate */
+			ret = PyUnicode_FromFormat("bpy.data...%s",
+									   path);
+		}
+		else {
+			ret = PyUnicode_FromFormat("bpy.data.%s[%R].%s",
+			                           BKE_idcode_to_name_plural(GS(id->name)),
+			                           tmp_str,
+		    	                       path);
+		}
+
 		MEM_freeN((void *)path);
 	}
 	else { /* cant find, print something sane */