[Bf-blender-cvs] [7c1f329] wiggly-widgets: Merge branch 'master' into wiggly-widgets

Julian Eisel noreply at git.blender.org
Fri Sep 25 22:34:29 CEST 2015


Commit: 7c1f329f286f464c77f970204a3b617ce6e56086
Author: Julian Eisel
Date:   Fri Sep 25 22:33:58 2015 +0200
Branches: wiggly-widgets
https://developer.blender.org/rB7c1f329f286f464c77f970204a3b617ce6e56086

Merge branch 'master' into wiggly-widgets

Conflicts:
	source/blender/blenkernel/intern/customdata.c
	source/blender/blenloader/intern/versioning_270.c
	source/blender/windowmanager/intern/wm_init_exit.c

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



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

diff --cc source/blender/blenkernel/BKE_blender.h
index 327ae89,327ae89..bb00752
--- a/source/blender/blenkernel/BKE_blender.h
+++ b/source/blender/blenkernel/BKE_blender.h
@@@ -42,7 -42,7 +42,7 @@@ extern "C" 
   * and keep comment above the defines.
   * Use STRINGIFY() rather than defining with quotes */
  #define BLENDER_VERSION         276
--#define BLENDER_SUBVERSION      1
++#define BLENDER_SUBVERSION      2
  /* Several breakages with 270, e.g. constraint deg vs rad */
  #define BLENDER_MINVERSION      270
  #define BLENDER_MINSUBVERSION   5
diff --cc source/blender/blenkernel/intern/customdata.c
index ed50bdd,815c18b..0d43fc7
--- a/source/blender/blenkernel/intern/customdata.c
+++ b/source/blender/blenkernel/intern/customdata.c
@@@ -1372,10 -1360,17 +1372,17 @@@ const CustomDataMask CD_MASK_BMESH 
      CD_MASK_PROP_STR | CD_MASK_SHAPEKEY | CD_MASK_SHAPE_KEYINDEX | CD_MASK_MDISPS |
      CD_MASK_CREASE | CD_MASK_BWEIGHT | CD_MASK_RECAST | CD_MASK_PAINT_MASK |
      CD_MASK_GRID_PAINT_MASK | CD_MASK_MVERT_SKIN | CD_MASK_FREESTYLE_EDGE | CD_MASK_FREESTYLE_FACE |
-     CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
- const CustomDataMask CD_MASK_FACECORNERS =  /* XXX Not used anywhere! */
-     CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
-     CD_MASK_MLOOPCOL | CD_MASK_NORMAL | CD_MASK_MLOOPTANGENT;
 -    CD_MASK_CUSTOMLOOPNORMAL;
++	CD_MASK_CUSTOMLOOPNORMAL | CD_MASK_FACEMAP;
+ /**
+  * cover values copied by #BKE_mesh_loops_to_tessdata
+  */
+ const CustomDataMask CD_MASK_FACECORNERS =
+     CD_MASK_MTFACE | CD_MASK_MTEXPOLY | CD_MASK_MLOOPUV |
+     CD_MASK_MCOL | CD_MASK_MLOOPCOL |
+     CD_MASK_PREVIEW_MCOL | CD_MASK_PREVIEW_MLOOPCOL |
+     CD_MASK_ORIGSPACE | CD_MASK_ORIGSPACE_MLOOP |
+     CD_MASK_TESSLOOPNORMAL | CD_MASK_NORMAL |
+     CD_MASK_TANGENT | CD_MASK_MLOOPTANGENT;
  const CustomDataMask CD_MASK_EVERYTHING =
      CD_MASK_MVERT | CD_MASK_MDEFORMVERT | CD_MASK_MEDGE | CD_MASK_MFACE |
      CD_MASK_MTFACE | CD_MASK_MCOL | CD_MASK_ORIGINDEX | CD_MASK_NORMAL /* | CD_MASK_POLYINDEX */ | CD_MASK_PROP_FLT |
diff --cc source/blender/blenloader/intern/versioning_270.c
index a7e91e2b,1f4aa3c..fabef39
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -854,42 -854,18 +854,57 @@@ void blo_do_versions_270(FileData *fd, 
  #undef BRUSH_TORUS
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 276, 2)) {
+ 		if (!DNA_struct_elem_find(fd->filesdna, "bPoseChannel", "float", "custom_scale")) {
+ 			Object *ob;
+ 
+ 			for (ob = main->object.first; ob; ob = ob->id.next) {
+ 				if (ob->pose) {
+ 					bPoseChannel *pchan;
+ 					for (pchan = ob->pose->chanbase.first; pchan; pchan = pchan->next) {
+ 						pchan->custom_scale = 1.0f;
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
++
 +	{
 +		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;
 +						}
 +					}
 +				}
 +			}
 +		}
 +
 +		if (!DNA_struct_elem_find(fd->filesdna, "SpaceIpo", "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_IPO) {
 +							SpaceIpo *sipo = (SpaceIpo *)sl;
 +							sipo->backdrop_zoom = 1.0f;
 +							sipo->backdrop_opacity = 0.7f;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
diff --cc source/blender/windowmanager/intern/wm_init_exit.c
index 8cf9b2c,ba4a807..fec2671
--- a/source/blender/windowmanager/intern/wm_init_exit.c
+++ b/source/blender/windowmanager/intern/wm_init_exit.c
@@@ -174,8 -174,10 +174,12 @@@ void WM_init(bContext *C, int argc, con
  	/* Enforce loading the UI for the initial homefile */
  	G.fileflags &= ~G_FILE_NO_UI;
  
 +	ED_spacedropwidgets_init();
 +
+ 	/* reports cant be initialized before the wm,
+ 	 * but keep before file reading, since that may report errors */
+ 	wm_init_reports(C);
+ 
  	/* get the default database, plus a wm */
  	wm_homefile_read(C, NULL, G.factory_startup, NULL);




More information about the Bf-blender-cvs mailing list