[Bf-blender-cvs] [c468922eaec] greasepencil-object: Merge branch 'blender2.8' into greasepencil-object

Antonio Vazquez noreply at git.blender.org
Sat May 6 18:47:24 CEST 2017


Commit: c468922eaec7b341c7930c2625e050944ea4e30e
Author: Antonio Vazquez
Date:   Fri May 5 20:15:30 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rBc468922eaec7b341c7930c2625e050944ea4e30e

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index cb6806d7d8c,0c872c8a081..d3275b2880f
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -257,47 -253,15 +257,57 @@@ void blo_do_versions_280(FileData *fd, 
  				}
  			}
  		}
 +		/* ------- convert grease pencil palettes to blender palettes --------------- */
 +		if (!DNA_struct_elem_find(fd->filesdna, "bGPDstroke", "Palette", "*palette")) {
 +			for (bGPdata *gpd = main->gpencil.first; gpd; gpd = gpd->id.next) {
 +				/* first create all palettes and colors */
 +				Palette *first = NULL;
 +				for (bGPDpalette *oldpalette = gpd->palettes.first; oldpalette; oldpalette = oldpalette->next) {
 +					/* create palette */
 +					Palette *newpalette = BKE_palette_add(main, oldpalette->info);
 +					/* save first to use later */
 +					if (first == NULL) {
 +						first = newpalette;
 +					}
 +					/* enable fake user by default */
 +					id_fake_user_set(&newpalette->id);
 +
 +					for (bGPDpalettecolor *oldcolor = oldpalette->colors.first; oldcolor; oldcolor = oldcolor->next) {
 +						PaletteColor *newcolor = BKE_palette_color_add_name(newpalette, oldcolor->info);
 +						/* set color attributes */
 +						copy_v4_v4(newcolor->rgb, oldcolor->color);
 +						copy_v4_v4(newcolor->fill, oldcolor->fill);
 +						newcolor->flag = oldcolor->flag;
 +					}
 +					/* set first color active by default */
 +					if (!BLI_listbase_is_empty(&newpalette->colors)) {
 +						newpalette->active_color = 0;
 +					}
 +				}
 +				/* second, assign the palette and the color (always to first palette) */
 +				for (bGPDlayer *gpl = gpd->layers.first; gpl; gpl = gpl->next) {
 +					for (bGPDframe *gpf = gpl->frames.first; gpf; gpf = gpf->next) {
 +						for (bGPDstroke *gps = gpf->strokes.first; gps; gps = gps->next) {
 +							Palette *palette = first;
 +							PaletteColor *palcolor = BKE_palette_color_getbyname(first, gps->colorname);
 +
 +							gps->palette = palette;
 +							gps->palcolor = palcolor;
 +						}
 +					}
 +				}
 +			}
 +		}
 +		/* ------- end grease pencil palettes conversion --------------- */
  	}
+ 
+ 	if (!DNA_struct_elem_find(fd->filesdna, "SceneLayer", "IDProperty", "properties")) {
+ 		for (Scene *scene = main->scene.first; scene; scene = scene->id.next) {
+ 			for (SceneLayer *sl = scene->render_layers.first; sl; sl = sl->next) {
+ 				IDPropertyTemplate val = {0};
+ 				sl->properties = IDP_New(IDP_GROUP, &val, ROOT_PROP);
+ 				BKE_scene_layer_engine_settings_create(sl->properties);
+ 			}
+ 		}
+ 	}
  }
diff --cc source/blender/draw/CMakeLists.txt
index 799fb1421fc,64371d74960..0ded1fbfdb3
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@@ -154,13 -151,10 +154,16 @@@ data_to_c_simple(modes/shaders/object_o
  data_to_c_simple(modes/shaders/object_outline_detect_frag.glsl SRC)
  data_to_c_simple(modes/shaders/object_grid_frag.glsl SRC)
  data_to_c_simple(modes/shaders/object_grid_vert.glsl SRC)
+ data_to_c_simple(modes/shaders/paint_wire_frag.glsl SRC)
+ data_to_c_simple(modes/shaders/paint_wire_vert.glsl SRC)
+ data_to_c_simple(modes/shaders/paint_vert_frag.glsl SRC)
  
 +data_to_c_simple(engines/gpencil/shaders/gpencil_fill_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_fill_frag.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_vert.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_geom.glsl SRC)
 +data_to_c_simple(engines/gpencil/shaders/gpencil_stroke_frag.glsl SRC)
 +
  list(APPEND INC
  )




More information about the Bf-blender-cvs mailing list