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

Antonio Vazquez noreply at git.blender.org
Thu Apr 13 12:42:36 CEST 2017


Commit: 1348caa1ab19dad2c9a3bd406d20830b59c004d4
Author: Antonio Vazquez
Date:   Thu Apr 13 12:29:26 2017 +0200
Branches: greasepencil-object
https://developer.blender.org/rB1348caa1ab19dad2c9a3bd406d20830b59c004d4

Merge branch 'blender2.8' into greasepencil-object

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



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

diff --cc source/blender/blenloader/intern/readfile.c
index b9cc5ba5be2,c81d591af59..020c4dfa5d7
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@@ -2237,17 -2265,9 +2267,17 @@@ static void lib_link_palette(FileData *
  	/* only link ID pointers */
  	for (Palette *palette = main->palettes.first; palette; palette = palette->id.next) {
  		if (palette->id.tag & LIB_TAG_NEED_LINK) {
- 			IDP_LibLinkProperty(palette->id.properties, (fd->flags & FD_FLAGS_SWITCH_ENDIAN), fd);
+ 			IDP_LibLinkProperty(palette->id.properties, fd);
  
  			palette->id.tag &= ~LIB_TAG_NEED_LINK;
 +
 +			lib_link_animdata(fd, &palette->id, palette->adt);
 +			/* relink images */
 +			for (PaletteColor *palcolor = palette->colors.first; palcolor; palcolor = palcolor->next) {
 +				if (palcolor->ima != NULL) {
 +					palcolor->ima = newlibadr(fd, palette->id.lib, palcolor->ima);
 +				}
 +			}
  		}
  	}
  }
diff --cc source/blender/draw/intern/draw_cache.c
index 9804da195bd,2cb5aa374fd..b4b9a0449b6
--- a/source/blender/draw/intern/draw_cache.c
+++ b/source/blender/draw/intern/draw_cache.c
@@@ -77,74 -76,39 +77,40 @@@ static struct DRWShapeCache 
  
  void DRW_shape_cache_free(void)
  {
- 	if (SHC.drw_single_vertice)
- 		Batch_discard_all(SHC.drw_single_vertice);
- 	if (SHC.drw_fullscreen_quad)
- 		Batch_discard_all(SHC.drw_fullscreen_quad);
- 	if (SHC.drw_plain_axes)
- 		Batch_discard_all(SHC.drw_plain_axes);
- 	if (SHC.drw_single_arrow)
- 		Batch_discard_all(SHC.drw_single_arrow);
- 	if (SHC.drw_cube)
- 		Batch_discard_all(SHC.drw_cube);
- 	if (SHC.drw_circle)
- 		Batch_discard_all(SHC.drw_circle);
- 	if (SHC.drw_square)
- 		Batch_discard_all(SHC.drw_square);
- 	if (SHC.drw_line)
- 		Batch_discard_all(SHC.drw_line);
- 	if (SHC.drw_line_endpoints)
- 		Batch_discard_all(SHC.drw_line_endpoints);
- 	if (SHC.drw_empty_sphere)
- 		Batch_discard_all(SHC.drw_empty_sphere);
- 	if (SHC.drw_empty_cone)
- 		Batch_discard_all(SHC.drw_empty_cone);
- 	if (SHC.drw_arrows)
- 		Batch_discard_all(SHC.drw_arrows);
- 	if (SHC.drw_axis_names)
- 		Batch_discard_all(SHC.drw_axis_names);
- 	if (SHC.drw_field_wind)
- 		Batch_discard_all(SHC.drw_field_wind);
- 	if (SHC.drw_field_force)
- 		Batch_discard_all(SHC.drw_field_force);
- 	if (SHC.drw_field_vortex)
- 		Batch_discard_all(SHC.drw_field_vortex);
- 	if (SHC.drw_field_tube_limit)
- 		Batch_discard_all(SHC.drw_field_tube_limit);
- 	if (SHC.drw_field_cone_limit)
- 		Batch_discard_all(SHC.drw_field_cone_limit);
- 	if (SHC.drw_lamp)
- 		Batch_discard_all(SHC.drw_lamp);
- 	if (SHC.drw_lamp_sunrays)
- 		Batch_discard_all(SHC.drw_lamp_sunrays);
- 	if (SHC.drw_lamp_area)
- 		Batch_discard_all(SHC.drw_lamp_area);
- 	if (SHC.drw_lamp_hemi)
- 		Batch_discard_all(SHC.drw_lamp_hemi);
- 	if (SHC.drw_lamp_spot)
- 		Batch_discard_all(SHC.drw_lamp_spot);
- 	if (SHC.drw_lamp_spot_square)
- 		Batch_discard_all(SHC.drw_lamp_spot_square);
- 	if (SHC.drw_speaker)
- 		Batch_discard_all(SHC.drw_speaker);
- 	if (SHC.drw_bone_octahedral)
- 		Batch_discard_all(SHC.drw_bone_octahedral);
- 	if (SHC.drw_bone_octahedral_wire)
- 		Batch_discard_all(SHC.drw_bone_octahedral_wire);
- 	if (SHC.drw_bone_point)
- 		Batch_discard_all(SHC.drw_bone_point);
- 	if (SHC.drw_bone_point_wire)
- 		Batch_discard_all(SHC.drw_bone_point_wire);
- 	if (SHC.drw_bone_arrows)
- 		Batch_discard_all(SHC.drw_bone_arrows);
- 	if (SHC.drw_camera)
- 		Batch_discard_all(SHC.drw_camera);
- 	if (SHC.drw_camera_tria)
- 		Batch_discard_all(SHC.drw_camera_tria);
- 	if (SHC.drw_camera_focus)
- 		Batch_discard_all(SHC.drw_camera_focus);
- 	if (SHC.drw_gpencil_axes)
- 		Batch_discard_all(SHC.drw_gpencil_axes);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_single_vertice);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_fullscreen_quad);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_plain_axes);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_single_arrow);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_cube);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_circle);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_square);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_line);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_line_endpoints);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_empty_sphere);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_empty_cone);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_arrows);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_axis_names);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_field_wind);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_field_force);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_field_vortex);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_field_tube_limit);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_field_cone_limit);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_sunrays);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_area);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_hemi);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_spot);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_lamp_spot_square);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_speaker);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_octahedral);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_octahedral_wire);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_point);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_point_wire);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_bone_arrows);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_camera);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_camera_tria);
+ 	BATCH_DISCARD_ALL_SAFE(SHC.drw_camera_focus);
++	BATCH_DISCARD_ALL_SAFE(SHC.drw_gpencil_axes);
  }
  
  /* Helper functions */




More information about the Bf-blender-cvs mailing list