[Bf-blender-cvs] [75cc320] layer-manager: Merge branch 'blender2.8' into layer-manager

Julian Eisel noreply at git.blender.org
Fri Nov 4 00:51:53 CET 2016


Commit: 75cc3206c5e0d12671421fd372c04f66360784f1
Author: Julian Eisel
Date:   Fri Nov 4 00:48:24 2016 +0100
Branches: layer-manager
https://developer.blender.org/rB75cc3206c5e0d12671421fd372c04f66360784f1

Merge branch 'blender2.8' into layer-manager

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

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



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

diff --cc source/blender/blenloader/intern/versioning_270.c
index 59aee93,e9c51d5..1f8648b
--- a/source/blender/blenloader/intern/versioning_270.c
+++ b/source/blender/blenloader/intern/versioning_270.c
@@@ -1340,21 -1338,26 +1340,44 @@@ void blo_do_versions_270(FileData *fd, 
  		}
  	}
  
+ 	{
+ 		if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
+ 			bScreen *screen;
+ 
+ 			for (screen = main->screen.first; screen; screen = screen->id.next) {
+ 				ScrArea *sa;
+ 				for (sa = screen->areabase.first; sa; sa = sa->next) {
+ 					SpaceLink *sl;
+ 
+ 					for (sl = sa->spacedata.first; sl; sl = sl->next) {
+ 						switch (sl->spacetype) {
+ 							case SPACE_VIEW3D:
+ 							{
+ 								View3D *v3d = (View3D *)sl;
+ 								v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
+ 							}
+ 						}
+ 					}
+ 				}
+ 			}
+ 		}
+ 	}
++
 +	/* Convert to new layer system */
- 	if (!MAIN_VERSION_ATLEAST(main, 277, 4)) {
++	if (!MAIN_VERSION_ATLEAST(main, 278, 2)) {
 +		if (!DNA_struct_elem_find(fd->filesdna, "Scene", "LayerTree", "*object_layers")) {
 +			for (Scene *sce = main->scene.first; sce; sce = sce->id.next) {
 +				sce->object_layers = BKE_objectlayer_tree_new();
 +
 +				BKE_objectlayer_base_entries_reserve(sce->object_layers->active_layer, BLI_listbase_count(&sce->base));
 +				/* For now, simply create a new layer and move all objects into it */
 +				for (Base *base = sce->base.first, *base_next; base; base = base_next) {
 +					base_next = base->next;
 +					BKE_objectlayer_base_assign_ex(base, sce->object_layers->active_layer, true, false);
 +					base->prev = base->next = NULL;
 +				}
 +				BLI_listbase_clear(&sce->base);
 +			}
 +		}
 +	}
  }
diff --cc source/blender/editors/uvedit/uvedit_draw.c
index 001bb7b,5c5e84e..47d267d
--- a/source/blender/editors/uvedit/uvedit_draw.c
+++ b/source/blender/editors/uvedit/uvedit_draw.c
@@@ -458,22 -467,24 +469,23 @@@ static void draw_uvs_other_mesh(Object 
  	}
  }
  
- static void draw_uvs_other(Scene *scene, Object *obedit, const Image *curimage, const bool new_shading_nodes)
+ static void draw_uvs_other(Scene *scene, Object *obedit, const Image *curimage, const bool new_shading_nodes,
+                            const int other_uv_filter)
  {
 -	Base *base;
 -
  	UI_ThemeColor(TH_UV_OTHERS);
  
 -	for (base = scene->base.first; base; base = base->next) {
 +	BKE_BASES_ITER_VISIBLE_START(scene, base)
 +	{
  		Object *ob = base->object;
  
  		if (!(base->flag & SELECT)) continue;
  		if (!(base->lay & scene->lay)) continue;
 -		if (ob->restrictflag & OB_RESTRICT_VIEW) continue;
  
  		if ((ob->type == OB_MESH) && (ob != obedit) && ((Mesh *)ob->data)->mloopuv) {
- 			draw_uvs_other_mesh(ob, curimage, new_shading_nodes);
+ 			draw_uvs_other_mesh(ob, curimage, new_shading_nodes, other_uv_filter);
  		}
  	}
 +	BKE_BASES_ITER_END;
  }
  
  static void draw_uvs_texpaint(SpaceImage *sima, Scene *scene, Object *ob)




More information about the Bf-blender-cvs mailing list