Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Thu, 5 Apr 2018 14:58:41 +0000 (16:58 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Thu, 5 Apr 2018 14:58:41 +0000 (16:58 +0200)
1  2 
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/image.c
source/blender/blenkernel/intern/sequencer.c
source/blender/blenkernel/intern/writeffmpeg.c
source/blender/editors/screen/area.c
source/blender/imbuf/intern/thumbs.c
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_movieclip.c
source/blender/makesrna/intern/rna_scene.c
source/blender/render/intern/source/pipeline.c

Simple merge
Simple merge
@@@ -772,27 -754,14 +772,35 @@@ static PointerRNA rna_IDPreview_get(Poi
        return rna_pointer_inherit_refine(ptr, &RNA_ImagePreview, prv_img);
  }
  
 +static int rna_ID_is_updated_get(PointerRNA *ptr)
 +{
 +      ID *id = (ID *)ptr->data;
 +      /* TODO(sergey): Do we need to limit some of flags here? */
 +      return ((id->recalc & ID_RECALC_ALL) != 0);
 +}
 +
 +static int rna_ID_is_updated_data_get(PointerRNA *ptr)
 +{
 +      ID *id = (ID *)ptr->data;
 +      if (GS(id->name) != ID_OB) {
 +              return 0;
 +      }
 +      Object *object = (Object *)id;
 +      ID *data = object->data;
 +      if (data == NULL) {
 +              return 0;
 +      }
 +      return ((data->recalc & ID_RECALC_ALL) != 0);
 +}
 +
+ static IDProperty *rna_IDPropertyWrapPtr_idprops(PointerRNA *ptr, bool UNUSED(create))
+ {
+       if (ptr == NULL) {
+               return NULL;
+       }
+       return ptr->data;
+ }
  #else
  
  static void rna_def_ID_properties(BlenderRNA *brna)