[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [53151] tags/blender-2.65a-release/blender : svn merge ^/trunk/blender -c53148

[Campbell Barton]

Revision: 53151
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53151
Author:   campbellbarton
Date:     2012-12-19 01:48:07 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
svn merge ^/trunk/blender -c53148

Modified Paths:
--------------
    tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/library.c

Property Changed:
----------------
    tags/blender-2.65a-release/blender/


Property changes on: tags/blender-2.65a-release/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095,53102-53105,53107
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/soc-2011-tomato:42376,42378-42379,42383,42385,42395,42397-42400,42407,42411,42418,42443-42444,42446,42467,42472,42486,42650-42652,42654-42655,42709-42710,42733-42734,42801,43872,44130,44141,44147-44149,44151-44152,44229-44230,45623-45625,46037,48089,48092,48551-48552,48679,48790,48792-48793,49076,49087,49292,49294,49466,49894,50052,50126
/trunk/blender:52842-52858,52867,52870-52871,52883,52891,52910,52915,52919,52928,52930,52945,52958,52966,52977,52981,52994-52998,53005,53015,53037-53039,53056,53061,53063,53065-53067,53077,53086-53087,53090,53095,53102-53105,53107,53148

Modified: tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/library.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/library.c	2012-12-19 01:42:28 UTC (rev 53150)
+++ tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/library.c	2012-12-19 01:48:07 UTC (rev 53151)
@@ -155,8 +155,10 @@
 /* ensure we have a real user */
 void id_us_ensure_real(ID *id)
 {
-	if (ID_REAL_USERS(id) <= 0) {
-		id->us = MAX2(id->us, 0) + 1;
+	if (id) {
+		if (ID_REAL_USERS(id) <= 0) {
+			id->us = MAX2(id->us, 0) + 1;
+		}
 	}
 }