[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60820] trunk/blender/source/blender/ editors/space_text/text_ops.c: Fix #37122: Text Editor: New Open-Shortcut different from Text > Open Text Block

[Sergey Sharybin]

Revision: 60820
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60820
Author:   nazgul
Date:     2013-10-17 12:53:37 +0000 (Thu, 17 Oct 2013)
Log Message:
-----------
Fix #37122: Text Editor: New Open-Shortcut different from Text > Open Text Block

Seems no user counter tricks are needed from r23598.

Also, r33453 is obviously wrong, because new ID's user counter is 1,
and could not exceed this value.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=23598
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=33453

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_text/text_ops.c

Modified: trunk/blender/source/blender/editors/space_text/text_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_text/text_ops.c	2013-10-17 12:28:32 UTC (rev 60819)
+++ trunk/blender/source/blender/editors/space_text/text_ops.c	2013-10-17 12:53:37 UTC (rev 60820)
@@ -174,12 +174,6 @@
 	uiIDContextProperty(C, &ptr, &prop);
 
 	if (prop) {
-		/* when creating new ID blocks, use is already 1, but RNA
-		 * pointer se also increases user, so this compensates it */
-		/* doesnt always seem to happen... (ton) */
-		if (text->id.us > 1)
-			text->id.us--;
-
 		RNA_id_pointer_create(&text->id, &idptr);
 		RNA_property_pointer_set(&ptr, prop, idptr);
 		RNA_property_update(C, &ptr, prop);
@@ -252,10 +246,6 @@
 	pprop = op->customdata;
 
 	if (pprop->prop) {
-		/* when creating new ID blocks, use is already 1, but RNA
-		 * pointer se also increases user, so this compensates it */
-		text->id.us--;
-
 		RNA_id_pointer_create(&text->id, &idptr);
 		RNA_property_pointer_set(&pprop->ptr, pprop->prop, idptr);
 		RNA_property_update(C, &pprop->ptr, pprop->prop);