[Bf-blender-cvs] [0a93cd9] wiggly-widgets: Merge branch 'master' into wiggly-widgets

Dalai Felinto noreply at git.blender.org
Mon Mar 30 14:41:24 CEST 2015


Commit: 0a93cd9eee6b9716c5337d6725829fa37949b3c2
Author: Dalai Felinto
Date:   Mon Mar 30 14:41:05 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB0a93cd9eee6b9716c5337d6725829fa37949b3c2

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/editors/include/ED_transform.h
	source/blender/gpu/intern/gpu_buffers.c

===================================================================



===================================================================

diff --cc source/blender/blenloader/intern/versioning_270.c
index 099715c,50cd393..7cf8795
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -666,27 -656,72 +656,94 @@@ void blo_do_versions_270(FileData *fd, 
  				}
  			}
  		}
+ 
+ 		/* hysteresis setted to 10% but not actived */
+ 		if (!DNA_struct_elem_find(fd->filesdna, "LodLevel", "int", "obhysteresis")) {
+ 			Object *ob;
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				LodLevel *level;
+ 				for (level = ob->lodlevels.first; level; level = level->next) {
+ 					level->obhysteresis = 10;
+ 				}
+ 			}
+ 		}
+ 
+ 		if (!DNA_struct_elem_find(fd->filesdna, "GameData", "int", "scehysteresis")) {
+ 			Scene *scene;
+ 			for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 				scene->gm.scehysteresis = 10;
+ 			}
+ 		}
+ 	}
+ 
+ 	if (!MAIN_VERSION_ATLEAST(main, 274, 2)) {
+ 		FOREACH_NODETREE(main, ntree, id) {
+ 			bNode *node;
+ 			bNodeSocket *sock;
+ 
+ 			for (node = ntree->nodes.first; node; node = node->next) {
+ 				if (node->type == SH_NODE_MATERIAL) {
+ 					for (sock = node->inputs.first; sock; sock = sock->next) {
+ 						if (STREQ(sock->name, "Refl")) {
+ 							BLI_strncpy(sock->name, "DiffuseIntensity", sizeof(sock->name));
+ 						}
+ 					}
+ 				}
+ 				else if (node->type == SH_NODE_MATERIAL_EXT) {
+ 					for (sock = node->outputs.first; sock; sock = sock->next) {
+ 						if (STREQ(sock->name, "Refl")) {
+ 							BLI_strncpy(sock->name, "DiffuseIntensity", sizeof(sock->name));
+ 						}
+ 						else if (STREQ(sock->name, "Ray Mirror")) {
+ 							BLI_strncpy(sock->name, "Reflectivity", sizeof(sock->name));
+ 						}
+ 					}
+ 				}
+ 			}
+ 		} FOREACH_NODETREE_END
+ 	}
+ 
+ 	if (!DNA_struct_elem_find(fd->filesdna, "Sequence", "char", "storage")) {
+ 		Scene *scene;
+ 		Sequence *seq;
+ 
+ #define SEQ_USE_PROXY_CUSTOM_DIR (1 << 19)
+ #define SEQ_USE_PROXY_CUSTOM_FILE (1 << 21)
+ 
+ 		for (scene = main->scene.first; scene; scene = scene->id.next) {
+ 			SEQ_BEGIN (scene->ed, seq) {
+ 				if (seq->strip && seq->strip->proxy) {
+ 					if (seq->flag & SEQ_USE_PROXY_CUSTOM_DIR)
+ 						seq->strip->proxy->storage = SEQ_STORAGE_PROXY_CUSTOM_DIR;
+ 					if (seq->flag & SEQ_USE_PROXY_CUSTOM_FILE)
+ 						seq->strip->proxy->storage = SEQ_STORAGE_PROXY_CUSTOM_FILE;
+ 				}
+ 			}
+ 			SEQ_END
+ 		}
+ #undef SEQ_USE_PROXY_CUSTOM_DIR
+ #undef SEQ_USE_PROXY_CUSTOM_FILE
  	}
 +
 +	if (!MAIN_VERSION_ATLEAST(main, 275, 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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
diff --cc source/blender/editors/include/ED_mesh.h
index b144fd2,8fb6fcb..c570432
--- a/source/blender/editors/include/ED_mesh.h
+++ b/source/blender/editors/include/ED_mesh.h
@@@ -39,15 -39,11 +39,12 @@@ struct ID
  struct View3D;
  struct ARegion;
  struct bContext;
 +struct bFaceMap;
  struct wmOperator;
- struct wmWindowManager;
  struct wmKeyConfig;
  struct ReportList;
- struct EditSelection;
  struct ViewContext;
  struct bDeformGroup;
- struct MDeformWeight;
  struct MDeformVert;
  struct Scene;
  struct Mesh;
diff --cc source/blender/gpu/GPU_buffers.h
index 69e1ddd,8b65666..cda7bff
--- a/source/blender/gpu/GPU_buffers.h
+++ b/source/blender/gpu/GPU_buffers.h
@@@ -50,14 -48,11 +48,14 @@@ struct GSet
  struct GPUVertPointLink;
  struct PBVH;
  
 +typedef void (*GPUBufferCopyFunc)(DerivedMesh *dm, float *varray, int *index,
 +                                  int *mat_orig_to_new, void *user_data);
 +
  typedef struct GPUBuffer {
- 	int size;	/* in bytes */
- 	void *pointer;	/* used with vertex arrays */
- 	unsigned int id;	/* used with vertex buffer objects */
- 	bool use_vbo;	/* true for VBOs, false for vertex arrays */
+ 	int size;        /* in bytes */
+ 	void *pointer;   /* used with vertex arrays */
+ 	unsigned int id; /* used with vertex buffer objects */
+ 	bool use_vbo;    /* true for VBOs, false for vertex arrays */
  } GPUBuffer;
  
  typedef struct GPUBufferMaterial {
diff --cc source/blender/windowmanager/WM_api.h
index d124031,e64d08f..d24bbb0
--- a/source/blender/windowmanager/WM_api.h
+++ b/source/blender/windowmanager/WM_api.h
@@@ -54,14 -53,8 +54,13 @@@ struct wmEvent
  struct wmEventHandler;
  struct wmGesture;
  struct wmJob;
- struct wmNotifier;
  struct wmOperatorType;
  struct wmOperator;
 +struct wmWidget;
 +struct wmWidgetGroup;
 +struct wmWidgetMap;
 +struct wmWidgetGroupType;
 +struct wmWidgetMapType;
  struct rcti;
  struct PointerRNA;
  struct PropertyRNA;




More information about the Bf-blender-cvs mailing list