[Bf-blender-cvs] [f754ce1c5e] transform-manipulators: Merge branch 'blender2.8' into transform-manipulators

Julian Eisel noreply at git.blender.org
Mon Jan 30 00:21:43 CET 2017


Commit: f754ce1c5e050d1637fe97d78f782d6a68da6c15
Author: Julian Eisel
Date:   Mon Jan 30 00:21:36 2017 +0100
Branches: transform-manipulators
https://developer.blender.org/rBf754ce1c5e050d1637fe97d78f782d6a68da6c15

Merge branch 'blender2.8' into transform-manipulators

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 66a2698eb8,477382d8c5..21880fdb2d
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1515,21 -1595,21 +1595,38 @@@ void blo_do_versions_270(FileData *fd, 
  			}
  		}
  	}
 +
 +	{
 +		/* New transform manipulators */
 +		if (!DNA_struct_elem_find(fd->filesdna, "View3D", "char", "transform_manipulators_type")) {
 +			for (bScreen *screen = main->screen.first; screen; screen = screen->id.next) {
 +				for (ScrArea *sa = screen->areabase.first; sa; sa = sa->next) {
 +					/* handle pushed-back space data first */
 +					for (SpaceLink *sl = sa->spacedata.first; sl; sl = sl->next) {
 +						if (sl->spacetype == SPACE_VIEW3D) {
 +							View3D *v3d = (View3D *)sl;
 +							v3d->flag3 |= V3D_USE_TRANSFORM_MANIPULATORS;
 +						}
 +					}
 +				}
 +			}
 +		}
 +	}
  }
+ 
+ void do_versions_after_linking_270(Main *main)
+ {
+ 	/* To be added to next subversion bump! */
+ 	{
+ 		FOREACH_NODETREE(main, ntree, id) {
+ 			if (ntree->type == NTREE_COMPOSIT) {
+ 				ntreeSetTypes(NULL, ntree);
+ 				for (bNode *node = ntree->nodes.first; node; node = node->next) {
+ 					if (node->type == CMP_NODE_HUE_SAT) {
+ 						do_version_hue_sat_node(ntree, node);
+ 					}
+ 				}
+ 			}
+ 		} FOREACH_NODETREE_END
+ 	}
+ }




More information about the Bf-blender-cvs mailing list