Merge branch 'master' into blender2.8
authorSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 12:07:34 +0000 (14:07 +0200)
committerSybren A. Stüvel <sybren@stuvel.eu>
Sun, 8 Apr 2018 12:07:34 +0000 (14:07 +0200)
12 files changed:
1  2 
release/scripts/startup/bl_ui/properties_render.py
source/blender/blenkernel/intern/armature_update.c
source/blender/blenkernel/intern/image.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/DocumentImporter.cpp
source/blender/editors/io/io_collada.c
source/blender/editors/render/render_internal.c
source/blender/editors/undo/memfile_undo.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_smoke.c
source/blender/nodes/shader/nodes/node_shader_volume_principled.c
source/blender/windowmanager/intern/wm_window.c

index a42aeee912ba1b40f6a97c4f422f9ce06b00d7ba,42c19c6bc65b0219a723fb978b96f0f605e1be45..4d0d59ae42cdabc2d4eda58dc0367fcebfc06dfa
@@@ -490,9 -496,7 +490,8 @@@ static int wm_collada_import_exec(bCont
        import_settings.min_chain_length = min_chain_length;
        import_settings.keep_bind_info = keep_bind_info != 0;
  
-       if (collada_import(C, &import_settings) )
-       {
+       if (collada_import(C, &import_settings)) {
 +              DEG_id_tag_update(&CTX_data_scene(C)->id, DEG_TAG_BASE_FLAGS_UPDATE);
                return OPERATOR_FINISHED;
        }
        else {