Commit: 8ad523b885e53ef13bf43f5e6cf3b0b1b1a3c4a9
Author: Antonio Vazquez
Date: Mon Jul 23 20:28:04 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB8ad523b885e53ef13bf43f5e6cf3b0b1b1a3c4a9
Merge branch 'blender2.8' into greasepencil-object
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_280.c
index 908456a5498,3a586e49ab3..d26a89a77a3
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -73,11 -70,9 +73,12 @@@
#include "BKE_report.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
+ #include "BKE_sequencer.h"
#include "BKE_studiolight.h"
#include "BKE_workspace.h"
+#include "BKE_gpencil.h"
+#include "BKE_paint.h"
+#include "BKE_object.h"
#include "BLO_readfile.h"
#include "readfile.h"
@@@ -757,9 -752,20 +758,21 @@@ void do_versions_after_linking_280(Mai
}
}
#endif
+
}
+ /* NOTE: this version patch is intended for versions < 2.52.2, but was
initially introduced in 2.27 already.
+ * But in 2.79 another case generating non-unique names was discovered
(see T55668, involving Meta strips)... */
+ static void do_versions_seq_unique_name_all_strips(Scene *sce, ListBase
*seqbasep)
+ {
+ for (Sequence *seq = seqbasep->first; seq != NULL; seq = seq->next) {
+ BKE_sequence_base_unique_name_recursive(&sce->ed->seqbase, seq);
+ if (seq->seqbase.first != NULL) {
+ do_versions_seq_unique_name_all_strips(sce,
&seq->seqbase);
+ }
+ }
+ }
+
void blo_do_versions_280(FileData *fd, Library *UNUSED(lib), Main *bmain)
{
bool use_collection_compat_28 = true;
@@@ -1709,20 -1638,6 +1726,21 @@@
BKE_screen_view3d_shading_init(&scene->display.shading);
}
}
+ /* initialize grease pencil view data */
+ if (!DNA_struct_elem_find(fd->filesdna, "SpaceView3D", "float",
"vertex_opacity")) {
+ for (bScreen *sc = bmain->screen.first; sc; sc =
sc->id.next) {
+ for (ScrArea *sa = sc->areabase.first; sa; sa =
sa->next) {
+ for (SpaceLink *sl =
sa->spacedata.first; sl; sl = sl->next) {
+ if (sl->spacetype ==
SPACE_VIEW3D) {
+ View3D *v3d = (View3D
*)sl;
+ v3d->vertex_opacity =
1.0f;
+ v3d->flag3 |=
V3D_GP_SHOW_EDIT_LINES;
+ }
+ }
+ }
+ }
+ }
+
}
+
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
