Fix T49273: Crash during access to dupli weights at launch time.
authorBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Sep 2016 10:45:58 +0000 (12:45 +0200)
committerBastien Montagne <montagne29@wanadoo.fr>
Wed, 7 Sep 2016 10:48:22 +0000 (12:48 +0200)
See commit's comments for details, but this boils down to: do not try to use
purely runtime cache data as a 'real' ID pointer in readcode, it's likely
doomed to fail in some cases, and is bad practice in any case!

Thix fix implies dupliweight's object will be invalid until first scene update
(i.e. first particles evaluation).

source/blender/blenkernel/intern/particle.c
source/blender/blenloader/intern/readfile.c

index aecaf8537bbfd0a620f991e11cb90722a83daf94..907521c9677d3d949c559c478241dd4aca05271f 100644 (file)
@@ -318,16 +318,24 @@ void psys_check_group_weights(ParticleSettings *part)
        int current = 0;
 
        if (part->ren_as == PART_DRAW_GR && part->dup_group && part->dup_group->gobject.first) {
-               /* first remove all weights that don't have an object in the group */
+               /* First try to find NULL objects from their index,
+                * and remove all weights that don't have an object in the group. */
                dw = part->dupliweights.first;
                while (dw) {
-                       if (!BKE_group_object_exists(part->dup_group, dw->ob)) {
-                               tdw = dw->next;
-                               BLI_freelinkN(&part->dupliweights, dw);
-                               dw = tdw;
+                       if (dw->ob == NULL || !BKE_group_object_exists(part->dup_group, dw->ob)) {
+                               GroupObject *go = (GroupObject *)BLI_findlink(&part->dup_group->gobject, dw->index);
+                               if (go) {
+                                       dw->ob = go->ob;
+                               }
+                               else {
+                                       tdw = dw->next;
+                                       BLI_freelinkN(&part->dupliweights, dw);
+                                       dw = tdw;
+                               }
                        }
-                       else
+                       else {
                                dw = dw->next;
+                       }
                }
 
                /* then add objects in the group to new list */
index 57d499fbe913950682b05a03aee3404164eee394..60f276b1744e71c2780366777371bc6e7019ba88 100644 (file)
@@ -4105,8 +4105,14 @@ static void lib_link_particlesettings(FileData *fd, Main *main)
                                if (index_ok) {
                                        /* if we have indexes, let's use them */
                                        for (dw = part->dupliweights.first; dw; dw = dw->next) {
-                                               GroupObject *go = (GroupObject *)BLI_findlink(&part->dup_group->gobject, dw->index);
-                                               dw->ob = go ? go->ob : NULL;
+                                               /* Do not try to restore pointer here, we have to search for group objects in another
+                                                * separated step.
+                                                * Reason is, the used group may be linked from another library, which has not yet
+                                                * been 'lib_linked'.
+                                                * Since dw->ob is not considered as an object user (it does not make objet directly linked),
+                                                * we may have no valid way to retrieve it yet.
+                                                * See T49273. */
+                                               dw->ob = NULL;
                                        }
                                }
                                else {