[Bf-blender-cvs] [ed75af5] alembic_pointcache: Merge branch 'master' into alembic_pointcache

[Lukas Tönne]

Commit: ed75af586e8d6d8349bd4220accf7e7980d01c11
Author: Lukas Tönne
Date:   Sat Mar 14 13:48:44 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rBed75af586e8d6d8349bd4220accf7e7980d01c11

Merge branch 'master' into alembic_pointcache

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



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

diff --cc source/blender/makesrna/intern/rna_main_api.c
index 433f287,ed8b85f..29ed6e4
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@@ -778,9 -780,9 +799,10 @@@ static int rna_Main_sounds_is_updated_g
  static int rna_Main_armatures_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_AR) != 0; }
  static int rna_Main_actions_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_AC) != 0; }
  static int rna_Main_particles_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_PA) != 0; }
+ static int rna_Main_palettes_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_PAL) != 0; }
  static int rna_Main_gpencil_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_GD) != 0; }
  static int rna_Main_linestyle_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_LS) != 0; }
 +static int rna_Main_cachelibraries_is_updated_get(PointerRNA *ptr) { return DAG_id_type_tagged(ptr->data, ID_CL) != 0; }
  
  #else