[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57009] trunk/blender/source/blender/ blenkernel/intern/material.c: fix [#35500] Material Copy Crash on specific scenes

[Campbell Barton]

Revision: 57009
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57009
Author:   campbellbarton
Date:     2013-05-25 00:23:23 +0000 (Sat, 25 May 2013)
Log Message:
-----------
fix [#35500] Material Copy Crash on specific scenes
check material textures exist before using in a pasted material.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/material.c

Modified: trunk/blender/source/blender/blenkernel/intern/material.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/material.c   2013-05-25 
00:22:04 UTC (rev 57008)
+++ trunk/blender/source/blender/blenkernel/intern/material.c   2013-05-25 
00:23:23 UTC (rev 57009)
@@ -1597,7 +1597,15 @@
                mtex = ma->mtex[a];
                if (mtex) {
                        ma->mtex[a] = MEM_dupallocN(mtex);
-                       if (mtex->tex) id_us_plus((ID *)mtex->tex);
+                       if (mtex->tex) {
+                               /* first check this is in main (we may have 
loaded another file) [#35500] */
+                               if (BLI_findindex(&G.main->tex, mtex->tex) != 
-1) {
+                                       id_us_plus((ID *)mtex->tex);
+                               }
+                               else {
+                                       ma->mtex[a]->tex = NULL;
+                               }
+                       }
                }
        }
 

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs