[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41552] trunk/blender/source/blender/ editors/gpencil/gpencil_edit.c: Fix #29162: grease pencil did not decrement user count on adding new datablock

[Brecht Van Lommel]

Revision: 41552
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41552
Author:   blendix
Date:     2011-11-05 10:48:43 +0000 (Sat, 05 Nov 2011)
Log Message:
-----------
Fix #29162: grease pencil did not decrement user count on adding new datablock
to replace an existing one.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/gpencil/gpencil_edit.c

Modified: trunk/blender/source/blender/editors/gpencil/gpencil_edit.c
===================================================================
--- trunk/blender/source/blender/editors/gpencil/gpencil_edit.c	2011-11-05 10:34:29 UTC (rev 41551)
+++ trunk/blender/source/blender/editors/gpencil/gpencil_edit.c	2011-11-05 10:48:43 UTC (rev 41552)
@@ -183,7 +183,10 @@
 		return OPERATOR_CANCELLED;
 	}
 	else {
-		/* just add new datablock now */
+		/* decrement user count and add new datablock */
+		bGPdata *gpd= (*gpd_ptr);
+
+		id_us_min(&gpd->id);
 		*gpd_ptr= gpencil_data_addnew("GPencil");
 	}
 	
@@ -231,7 +234,7 @@
 		/* just unlink datablock now, decreasing its user count */
 		bGPdata *gpd= (*gpd_ptr);
 		
-		gpd->id.us--;
+		id_us_min(&gpd->id);
 		*gpd_ptr= NULL;
 	}