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

[Antonio Vazquez]

Commit: 7b8b23d1ef57ec2b1248c205dc71f2de3fc4a55a
Author: Antonio Vazquez
Date:   Mon May 8 12:03:47 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7b8b23d1ef57ec2b1248c205dc71f2de3fc4a55a

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/versioning_280.c
index d3275b2880f,a0468be6791..70ae4348698
--- a/source/blender/blenloader/intern/versioning_280.c
+++ b/source/blender/blenloader/intern/versioning_280.c
@@@ -257,51 -253,9 +257,51 @@@ 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")) {
+ 	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};
diff --cc source/blender/draw/modes/draw_mode_engines.h
index 6bef5a6d949,23fedbba5a5..ecf56c76e08
--- a/source/blender/draw/modes/draw_mode_engines.h
+++ b/source/blender/draw/modes/draw_mode_engines.h
@@@ -40,6 -40,5 +40,6 @@@ extern DrawEngineType draw_engine_paint
  extern DrawEngineType draw_engine_particle_type;
  extern DrawEngineType draw_engine_pose_type;
  extern DrawEngineType draw_engine_sculpt_type;
 +extern DrawEngineType draw_engine_gpencil_type;
  
- #endif /* __DRAW_MODES_ENGINES_H__ */
+ #endif /* __DRAW_MODE_ENGINES_H__ */