Commit: 004429761d182cc726035d89e442ae7067a8f144
Author: Lukas Tönne
Date: Tue Mar 17 11:07:03 2015 +0100
Branches: gooseberry
https://developer.blender.org/rB004429761d182cc726035d89e442ae7067a8f144
Merge branch 'master' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/editors/include/ED_view3d.h
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index c6aea63,ee015fa..69dadae
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -778,25 -655,16 +778,36 @@@ void blo_do_versions_270(FileData *fd,
}
}
- if (!MAIN_VERSION_ATLEAST(main, 274, 1)) {
+ if (!MAIN_VERSION_ATLEAST(main, 274, 0)) {
+ if (!DNA_struct_elem_find(fd->filesdna, "SpaceNode", "float",
"backdrop_zoom")) {
+ bScreen *sc;
+ for (sc = main->screen.first; sc; sc = sc->id.next) {
+ ScrArea *sa;
+ for (sa = sc->areabase.first; sa; sa =
sa->next) {
+ SpaceLink *sl;
+ for (sl = sa->spacedata.first; sl; sl =
sl->next) {
+ if (sl->spacetype ==
SPACE_NODE) {
+ SpaceNode *snode =
(SpaceNode *)sl;
+ snode->backdrop_zoom =
1.0;
+ }
+ if (sl->spacetype == SPACE_SEQ)
{
+ SpaceSeq *sseq =
(SpaceSeq *)sl;
+ sseq->overdrop_zoom =
1.0;
+ }
+ }
+ }
+ }
+ }
++
+ /* particle systems need to be forced to redistribute for
jitter mode fix */
+ {
+ Object *ob;
+ ParticleSystem *psys;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ for (psys = ob->particlesystem.first; psys;
psys = psys->next) {
+ psys->recalc |= PSYS_RECALC_RESET;
+ }
+ }
+ }
}
}
diff --cc source/blender/editors/include/ED_view3d.h
index c22f27c,11f9616..57d0f67
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -62,9 -61,7 +62,10 @@@ struct rcti
struct wmOperator;
struct wmOperatorType;
struct wmWindow;
+ struct wmWindowManager;
+struct wmWidget;
+struct wmWidgetGroup;
+struct wmWidgetGroupType;
struct GPUFX;
struct GPUOffScreen;
struct GPUFXSettings;
@@@ -382,10 -377,8 +383,11 @@@ void ED_view3d_operator_properties_view
void ED_view3d_operator_properties_viewmat_get(struct wmOperator *op, int
*winx, int *winy, float persmat[4][4]);
#endif
+int WIDGETGROUP_lamp_poll(const struct bContext *C, struct wmWidgetGroupType
*wgrouptype);
+void WIDGETGROUP_lamp_draw(const struct bContext *C, struct wmWidgetGroup
*wgroup);
+
/* render */
+ void ED_view3d_stop_render_preview(struct wmWindowManager *wm, struct ARegion
*ar);
void ED_view3d_shade_update(struct Main *bmain, struct Scene *scene, struct
View3D *v3d, struct ScrArea *sa);
#endif /* __ED_VIEW3D_H__ */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
