[Bf-blender-cvs] [ef056018c00] asset-engine: Merge branch 'id_override_static' into asset-engine

[Bastien Montagne]

Commit: ef056018c00ec675d600589d8188382ad8185e4b
Author: Bastien Montagne
Date:   Mon Sep 25 11:43:00 2017 +0200
Branches: asset-engine
https://developer.blender.org/rBef056018c00ec675d600589d8188382ad8185e4b

Merge branch 'id_override_static' into asset-engine

Conflicts:
	source/blender/makesdna/DNA_scene_types.h

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



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

diff --cc source/blender/makesdna/DNA_scene_types.h
index ceccc0412bb,de3c926c23d..228b846302a
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@@ -1729,8 -1691,8 +1691,6 @@@ typedef struct Scene 
  	/* Movie Tracking */
  	struct MovieClip *clip;			/* active movie clip */
  
- 	void *pad_v1;
 -	void *pad4;
--
  	uint64_t customdata_mask;	/* XXX. runtime flag for drawing, actually belongs in the window, only used by BKE_object_handle_update() */
  	uint64_t customdata_mask_modal; /* XXX. same as above but for temp operator use (gl renders) */