[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50728] trunk/blender/source/blender: do_version fix files with bad keyblock uid caused by byg [#31569]

[Campbell Barton]

Revision: 50728
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50728
Author:   campbellbarton
Date:     2012-09-18 14:40:02 +0000 (Tue, 18 Sep 2012)
Log Message:
-----------
do_version fix files with bad keyblock uid caused by byg [#31569]

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_blender.h
    trunk/blender/source/blender/blenloader/intern/readfile.c
    trunk/blender/source/blender/editors/space_node/drawnode.c
    trunk/blender/source/blender/makesdna/DNA_key_types.h
    trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c

Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-09-18 14:29:01 UTC (rev 50727)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h	2012-09-18 14:40:02 UTC (rev 50728)
@@ -42,7 +42,7 @@
  * and keep comment above the defines.
  * Use STRINGIFY() rather than defining with quotes */
 #define BLENDER_VERSION         263
-#define BLENDER_SUBVERSION      19
+#define BLENDER_SUBVERSION      20
 
 /* 262 was the last editmesh release but its has compatibility code for bmesh data,
  * so set the minversion to 2.61 */

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2012-09-18 14:29:01 UTC (rev 50727)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2012-09-18 14:40:02 UTC (rev 50728)
@@ -2717,6 +2717,16 @@
 
 /* ************ READ keys ***************** */
 
+static void do_versions_key_uidgen(Key *key)
+{
+	KeyBlock *block;
+
+	key->uidgen = 1;
+	for (block = key->block.first; block; block = block->next) {
+		block->uid = key->uidgen++;
+	}
+}
+
 static void lib_link_key(FileData *fd, Main *main)
 {
 	Key *key;
@@ -2724,12 +2734,7 @@
 	for (key = main->key.first; key; key = key->id.next) {
 		/*check if we need to generate unique ids for the shapekeys*/
 		if (!key->uidgen) {
-			KeyBlock *block;
-			
-			key->uidgen = 1;
-			for (block=key->block.first; block; block=block->next) {
-				block->uid = key->uidgen++;
-			}
+			do_versions_key_uidgen(key);
 		}
 		
 		if (key->id.flag & LIB_NEED_LINK) {
@@ -7974,6 +7979,13 @@
 		}
 	}
 
+	if (main->versionfile < 263 || (main->versionfile == 263 && main->subversionfile < 20)) {
+		Key *key;
+		for (key = main->key.first; key; key = key->id.next) {
+			do_versions_key_uidgen(key);
+		}
+	}
+
 	/* WATCH IT!!!: pointers from libdata have not been converted yet here! */
 	/* WATCH IT 2!: Userdef struct init has to be in editors/interface/resources.c! */
 

Modified: trunk/blender/source/blender/editors/space_node/drawnode.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/drawnode.c	2012-09-18 14:29:01 UTC (rev 50727)
+++ trunk/blender/source/blender/editors/space_node/drawnode.c	2012-09-18 14:40:02 UTC (rev 50728)
@@ -69,9 +69,6 @@
 
 #include "node_intern.h"  /* own include */
 
-/* XXX interface.h */
-extern void ui_dropshadow(const rctf *rct, float radius, float aspect, float alpha, int select);
-
 /* ****************** SOCKET BUTTON DRAW FUNCTIONS ***************** */
 
 static void node_sync_cb(bContext *UNUSED(C), void *snode_v, void *node_v)

Modified: trunk/blender/source/blender/makesdna/DNA_key_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_key_types.h	2012-09-18 14:29:01 UTC (rev 50727)
+++ trunk/blender/source/blender/makesdna/DNA_key_types.h	2012-09-18 14:40:02 UTC (rev 50728)
@@ -105,7 +105,7 @@
 
 /* Key->type: KeyBlocks are interpreted as... */
 enum {
-	/* Sequencial positions over time (using KeyBlock->pos and Key->ctime) */
+	/* Sequential positions over time (using KeyBlock->pos and Key->ctime) */
 	KEY_NORMAL      = 0,
 
 	/* States to blend between (default) */

Modified: trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c	2012-09-18 14:29:01 UTC (rev 50727)
+++ trunk/blender/source/blender/makesrna/intern/rna_sequencer_api.c	2012-09-18 14:40:02 UTC (rev 50728)
@@ -37,8 +37,6 @@
 #include "DNA_scene_types.h"
 #include "DNA_sequence_types.h"
 
-extern EnumPropertyItem blend_mode_items[];
-
 #ifdef RNA_RUNTIME
 
 //#include "DNA_anim_types.h"