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

Campbell Barton ideasman42 at gmail.com
Tue Dec 18 10:02:52 CET 2012


Revision: 53109
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=53109
Author:   campbellbarton
Date:     2012-12-18 09:02:47 +0000 (Tue, 18 Dec 2012)
Log Message:
-----------
svn merge ^/trunk/blender -c 53107

Modified Paths:
--------------
    tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_library.h
    tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/library.c
    tags/blender-2.65a-release/blender/source/blender/blenloader/intern/readfile.c
    tags/blender-2.65a-release/blender/source/blender/editors/animation/anim_channels_edit.c
    tags/blender-2.65a-release/blender/source/blender/editors/space_clip/clip_editor.c
    tags/blender-2.65a-release/blender/source/blender/editors/space_image/image_edit.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
   + /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

Modified: tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_library.h
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_library.h	2012-12-18 08:50:22 UTC (rev 53108)
+++ tags/blender-2.65a-release/blender/source/blender/blenkernel/BKE_library.h	2012-12-18 09:02:47 UTC (rev 53109)
@@ -62,6 +62,7 @@
 void BKE_id_lib_local_paths(struct Main *bmain, struct Library *lib, struct ID *id);
 void id_lib_extern(struct ID *id);
 void BKE_library_filepath_set(struct Library *lib, const char *filepath);
+void id_us_ensure_real(struct ID *id);
 void id_us_plus(struct ID *id);
 void id_us_min(struct ID *id);
 

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-18 08:50:22 UTC (rev 53108)
+++ tags/blender-2.65a-release/blender/source/blender/blenkernel/intern/library.c	2012-12-18 09:02:47 UTC (rev 53109)
@@ -152,6 +152,14 @@
 	}
 }
 
+/* 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;
+	}
+}
+
 void id_us_plus(ID *id)
 {
 	if (id) {

Modified: tags/blender-2.65a-release/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/blenloader/intern/readfile.c	2012-12-18 08:50:22 UTC (rev 53108)
+++ tags/blender-2.65a-release/blender/source/blender/blenloader/intern/readfile.c	2012-12-18 09:02:47 UTC (rev 53109)
@@ -5459,7 +5459,14 @@
 			for (; idn; idn = idn->next) {
 				if (idn->name[2] == name[0] && strcmp(idn->name+2, name) == 0) {
 					if (idn->lib == id->lib) {
-						if (user && idn->us == 0) idn->us++;
+						if (user == 1) {
+							if (idn->us == 0) {
+								idn->us++;
+							}
+						}
+						else if (user == 2) {
+							id_us_ensure_real(idn);
+						}
 						break;
 					}
 				}
@@ -5625,7 +5632,7 @@
 				else if (sl->spacetype == SPACE_IMAGE) {
 					SpaceImage *sima = (SpaceImage *)sl;
 					
-					sima->image = restore_pointer_by_name(newmain, (ID *)sima->image, 1);
+					sima->image = restore_pointer_by_name(newmain, (ID *)sima->image, 2);
 					
 					/* this will be freed, not worth attempting to find same scene,
 					 * since it gets initialized later */
@@ -5641,7 +5648,7 @@
 					 * so assume that here we're doing for undo only...
 					 */
 					sima->gpd = restore_pointer_by_name(newmain, (ID *)sima->gpd, 1);
-					sima->mask_info.mask = restore_pointer_by_name(newmain, (ID *)sima->mask_info.mask, 1);
+					sima->mask_info.mask = restore_pointer_by_name(newmain, (ID *)sima->mask_info.mask, 2);
 				}
 				else if (sl->spacetype == SPACE_SEQ) {
 					SpaceSeq *sseq = (SpaceSeq *)sl;
@@ -5716,8 +5723,8 @@
 				else if (sl->spacetype == SPACE_CLIP) {
 					SpaceClip *sclip = (SpaceClip *)sl;
 					
-					sclip->clip = restore_pointer_by_name(newmain, (ID *)sclip->clip, 1);
-					sclip->mask_info.mask = restore_pointer_by_name(newmain, (ID *)sclip->mask_info.mask, 1);
+					sclip->clip = restore_pointer_by_name(newmain, (ID *)sclip->clip, 2);
+					sclip->mask_info.mask = restore_pointer_by_name(newmain, (ID *)sclip->mask_info.mask, 2);
 					
 					sclip->scopes.ok = 0;
 				}

Modified: tags/blender-2.65a-release/blender/source/blender/editors/animation/anim_channels_edit.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/animation/anim_channels_edit.c	2012-12-18 08:50:22 UTC (rev 53108)
+++ tags/blender-2.65a-release/blender/source/blender/editors/animation/anim_channels_edit.c	2012-12-18 09:02:47 UTC (rev 53109)
@@ -1226,7 +1226,7 @@
 
 			case ANIMTYPE_MASKLAYER:
 			{
-				/* Grease Pencil layer */
+				/* Mask layer */
 				Mask *mask = (Mask *)ale->id;
 				MaskLayer *masklay = (MaskLayer *)ale->data;
 

Modified: tags/blender-2.65a-release/blender/source/blender/editors/space_clip/clip_editor.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/space_clip/clip_editor.c	2012-12-18 08:50:22 UTC (rev 53108)
+++ tags/blender-2.65a-release/blender/source/blender/editors/space_clip/clip_editor.c	2012-12-18 09:02:47 UTC (rev 53109)
@@ -38,6 +38,7 @@
 #include "BKE_movieclip.h"
 #include "BKE_context.h"
 #include "BKE_tracking.h"
+#include "BKE_library.h"
 
 #include "DNA_mask_types.h"
 #include "DNA_object_types.h"	/* SELECT */
@@ -524,8 +525,7 @@
 	old_clip = sc->clip;
 	sc->clip = clip;
 
-	if (sc->clip && sc->clip->id.us == 0)
-		sc->clip->id.us = 1;
+	id_us_ensure_real((ID *)sc->clip);
 
 	if (screen && sc->view == SC_VIEW_CLIP) {
 		ScrArea *area;
@@ -561,9 +561,7 @@
 {
 	sc->mask_info.mask = mask;
 
-	if (sc->mask_info.mask && sc->mask_info.mask->id.us == 0) {
-		sc->mask_info.mask->id.us = 1;
-	}
+	id_us_ensure_real((ID *)sc->mask_info.mask);
 
 	if (C) {
 		WM_event_add_notifier(C, NC_MASK | NA_SELECTED, mask);

Modified: tags/blender-2.65a-release/blender/source/blender/editors/space_image/image_edit.c
===================================================================
--- tags/blender-2.65a-release/blender/source/blender/editors/space_image/image_edit.c	2012-12-18 08:50:22 UTC (rev 53108)
+++ tags/blender-2.65a-release/blender/source/blender/editors/space_image/image_edit.c	2012-12-18 09:02:47 UTC (rev 53109)
@@ -40,6 +40,7 @@
 #include "BKE_image.h"
 #include "BKE_main.h"
 #include "BKE_tessmesh.h"
+#include "BKE_library.h"
 
 #include "IMB_imbuf_types.h"
 
@@ -78,8 +79,7 @@
 	if (sima->image)
 		BKE_image_signal(sima->image, &sima->iuser, IMA_SIGNAL_USER_NEW_IMAGE);
 
-	if (sima->image && ID_REAL_USERS(sima->image) <= 0)
-		sima->image->id.us = max_ii(sima->image->id.us, 0) + 1;
+	id_us_ensure_real((ID *)sima->image);
 
 	if (obedit)
 		WM_main_add_notifier(NC_GEOM | ND_DATA, obedit->data);
@@ -97,8 +97,7 @@
 	sima->mask_info.mask = mask;
 
 	/* weak, but same as image/space */
-	if (sima->mask_info.mask && ID_REAL_USERS(sima->mask_info.mask) <= 0)
-		sima->mask_info.mask->id.us = max_ii(sima->mask_info.mask->id.us, 0) + 1;
+	id_us_ensure_real((ID *)sima->mask_info.mask);
 
 	if (C) {
 		WM_event_add_notifier(C, NC_MASK | NA_SELECTED, mask);




More information about the Bf-blender-cvs mailing list