[Bf-blender-cvs] [22f3035] temp_widgets_update_tagging: Merge branch 'master' into temp_widgets_update_tagging

Julian Eisel noreply at git.blender.org
Mon Mar 7 14:10:31 CET 2016


Commit: 22f3035ffef29ffda7ff2f43d05eefc41cba10df
Author: Julian Eisel
Date:   Mon Mar 7 14:10:08 2016 +0100
Branches: temp_widgets_update_tagging
https://developer.blender.org/rB22f3035ffef29ffda7ff2f43d05eefc41cba10df

Merge branch 'master' into temp_widgets_update_tagging

Conflicts:
	source/blender/blenloader/intern/versioning_270.c

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index c909b40,def1eab..b6fd646
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1058,42 -1058,14 +1058,53 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	if (!MAIN_VERSION_ATLEAST(main, 277, 1)) {
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			ParticleEditSettings *pset = &scene->toolsettings->particle;
+ 			for (int a = 0; a < PE_TOT_BRUSH; a++) {
+ 				if (pset->brush[a].strength > 1.0f) {
+ 					pset->brush[a].strength *= 0.01f;
+ 				}
+ 			}
+ 		}
+ 	}
++
 +	{
 +		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/editors/space_api/spacetypes.c
index 71d8e1f,ac6e312..4b5aa61
--- a/source/blender/editors/space_api/spacetypes.c
+++ b/source/blender/editors/space_api/spacetypes.c
@@@ -120,17 -120,13 +120,17 @@@ void ED_spacetypes_init(void
  	ED_operatortypes_io();
  	
  	ED_operatortypes_view2d();
- 	ED_button_operatortypes();
+ 	ED_operatortypes_ui();
  	
 -	/* register operators */
  	spacetypes = BKE_spacetypes_list();
  	for (type = spacetypes->first; type; type = type->next) {
 +		/* register widgets, operators, dropboxes */
 +		if (type->widgets)
 +			type->widgets();
  		if (type->operatortypes)
  			type->operatortypes();
 +		if (type->dropboxes)
 +			type->dropboxes();
  	}
  
  	/* register internal render callbacks */




More information about the Bf-blender-cvs mailing list