Commit: d445330c5336394272744534820563c731ceb9b3
Author: Antony Riakiotakis
Date: Thu Dec 11 14:06:58 2014 +0100
Branches: gooseberry
https://developer.blender.org/rBd445330c5336394272744534820563c731ceb9b3
Merge branch 'wiggly-widgets' into gooseberry
Conflicts:
source/blender/blenloader/intern/versioning_270.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/intern/wm_event_system.c
===================================================================
===================================================================
diff --cc source/blender/blenloader/intern/versioning_270.c
index dc31e8f,8d1d1b5..c905e83
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -437,31 -436,24 +437,52 @@@ void blo_do_versions_270(FileData *fd,
}
}
+ if (!DNA_struct_elem_find(fd->filesdna, "ClothSimSettings", "float",
"bending_damping")) {
+ Object *ob;
+ ModifierData *md;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ for (md = ob->modifiers.first; md; md = md->next) {
+ if (md->type == eModifierType_Cloth) {
+ ClothModifierData *clmd =
(ClothModifierData*) md;
+ clmd->sim_parms->bending_damping = 0.5f;
+ }
+ else if (md->type ==
eModifierType_ParticleSystem) {
+ ParticleSystemModifierData *pmd =
(ParticleSystemModifierData*) md;
+ if (pmd->psys->clmd) {
+
pmd->psys->clmd->sim_parms->bending_damping = 0.5f;
+ }
+ }
+ }
+ }
+ }
-
++
+ if (!MAIN_VERSION_ATLEAST(main, 272, 3)) {
+ 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->backdrop_zoom = 1.0;
+ }
+
+ }
+ }
+ }
+ }
++
+ if (!DNA_struct_elem_find(fd->filesdna, "ParticleSystem", "float",
"hair_preview_factor")) {
+ Object *ob;
+ ParticleSystem *psys;
+ for (ob = main->object.first; ob; ob = ob->id.next) {
+ for(psys = ob->particlesystem.first; psys; psys =
psys->next)
+ psys->hair_preview_factor = 100.0f;
+ }
+ }
}
diff --cc source/blender/editors/include/ED_view3d.h
index 55c5cc2,c606525..7808861
--- a/source/blender/editors/include/ED_view3d.h
+++ b/source/blender/editors/include/ED_view3d.h
@@@ -62,11 -62,9 +62,12 @@@ struct rcti
struct wmOperator;
struct wmOperatorType;
struct wmWindow;
+struct GPUFX;
+struct GPUOffScreen;
+struct GPUFXOptions;
struct wmWidget;
struct wmWidgetGroup;
+ struct wmWidgetGroupType;
/* for derivedmesh drawing callbacks, for view3d_select, .... */
typedef struct ViewContext {
diff --cc source/blender/makesdna/DNA_key_types.h
index 7d3ccbe,a250ff7..90cc1ef
--- a/source/blender/makesdna/DNA_key_types.h
+++ b/source/blender/makesdna/DNA_key_types.h
@@@ -66,21 -67,8 +67,20 @@@ typedef struct KeyBlock
/* ranges, for RNA and UI only to clamp 'curval' */
float slidermin;
float slidermax;
-
} KeyBlock;
+typedef struct KeyFrom {
+ int type;
+ int index; /* index of owner in the id */
+} KeyFrom;
+
+typedef enum eKeyOwnerType {
+ /* 0 used as 'undefined', for versioning */
+ KEY_OWNER_MESH = 1,
+ KEY_OWNER_CURVE = 2,
+ KEY_OWNER_LATTICE = 3,
+ KEY_OWNER_PARTICLES = 4,
+} eKeyOwnerType;
typedef struct Key {
ID id;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
