[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42941] branches/bmesh/blender: svn merge ^/trunk/blender -r42935:42940

[Campbell Barton]

Revision: 42941
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42941
Author:   campbellbarton
Date:     2011-12-28 15:14:52 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
svn merge ^/trunk/blender -r42935:42940

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

Modified Paths:
--------------
    branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
    branches/bmesh/blender/source/blender/python/SConscript

Property Changed:
----------------
    branches/bmesh/blender/


Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42935
   + /branches/soc-2011-cucumber:37517
/branches/soc-2011-tomato:42376,42378-42379,42397,42400
/trunk/blender:39992-42940

Modified: branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/bmesh/blender/source/blender/blenloader/intern/readfile.c	2011-12-28 15:08:58 UTC (rev 42940)
+++ branches/bmesh/blender/source/blender/blenloader/intern/readfile.c	2011-12-28 15:14:52 UTC (rev 42941)
@@ -3810,6 +3810,36 @@
 	direct_link_customdata(fd, &mesh->ldata, mesh->totloop);
 	direct_link_customdata(fd, &mesh->pdata, mesh->totpoly);
 	
+
+#ifdef USE_BMESH_FORWARD_COMPAT
+	/* NEVER ENABLE THIS CODE INTO BMESH!
+	 * THIS IS FOR LOADING BMESH INTO OLDER FILES ONLY */
+	mesh->mpoly= newdataadr(fd, mesh->mpoly);
+	mesh->mloop= newdataadr(fd, mesh->mloop);
+
+	direct_link_customdata(fd, &mesh->pdata, mesh->totpoly);
+	direct_link_customdata(fd, &mesh->ldata, mesh->totloop);
+
+	if (mesh->mpoly) {
+		/* be clever and load polygons as mfaces */
+
+		mesh->totface= mesh_mpoly_to_mface(&mesh->fdata, &mesh->ldata, &mesh->pdata,
+		                                   mesh->totface, mesh->totloop, mesh->totpoly);
+
+		CustomData_free(&mesh->pdata, mesh->totpoly);
+		memset(&mesh->pdata, 0, sizeof(CustomData));
+		mesh->totpoly = 0;
+
+		CustomData_free(&mesh->ldata, mesh->totloop);
+		memset(&mesh->ldata, 0, sizeof(CustomData));
+		mesh->totloop = 0;
+
+		mesh_update_customdata_pointers(mesh);
+	}
+
+#endif
+
+
 	mesh->bb= NULL;
 	mesh->mselect = NULL;
 	mesh->edit_btmesh= NULL;

Modified: branches/bmesh/blender/source/blender/python/SConscript
===================================================================
--- branches/bmesh/blender/source/blender/python/SConscript	2011-12-28 15:08:58 UTC (rev 42940)
+++ branches/bmesh/blender/source/blender/python/SConscript	2011-12-28 15:14:52 UTC (rev 42941)
@@ -48,6 +48,7 @@
 
 if env['WITH_BF_FFMPEG']:
     defs.append('WITH_FFMPEG')
+    incs += ' ' + env['BF_FFMPEG_INC']
 
 sources = env.Glob('intern/*.c')
 env.BlenderLib( libname = 'bf_python', sources = Split(sources), includes = Split(incs), defines = defs, libtype = ['core'], priority = [361])