Merge branch 'master' into blender2.8
authorBastien Montagne <montagne29@wanadoo.fr>
Mon, 12 Dec 2016 15:17:57 +0000 (16:17 +0100)
committerBastien Montagne <montagne29@wanadoo.fr>
Mon, 12 Dec 2016 15:17:57 +0000 (16:17 +0100)
Conflicts:
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_particle.c

41 files changed:
1  2 
CMakeLists.txt
build_files/build_environment/install_deps.sh
intern/cycles/blender/addon/properties.py
release/scripts/startup/bl_operators/object_quick_effects.py
release/scripts/startup/bl_ui/properties_data_modifier.py
release/scripts/startup/bl_ui/properties_physics_smoke.py
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_library.h
source/blender/blenkernel/BKE_rigidbody.h
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/effect.c
source/blender/blenkernel/intern/library.c
source/blender/blenkernel/intern/library_remap.c
source/blender/blenkernel/intern/rigidbody.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/versioning_270.c
source/blender/depsgraph/intern/builder/deg_builder_relations.cc
source/blender/editors/gpencil/gpencil_brush.c
source/blender/editors/interface/interface_eyedropper.c
source/blender/editors/object/object_add.c
source/blender/editors/object/object_relations.c
source/blender/editors/space_view3d/view3d_edit.c
source/blender/editors/space_view3d/view3d_ruler.c
source/blender/editors/transform/transform.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/makesrna.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_color.c
source/blender/makesrna/intern/rna_dynamicpaint.c
source/blender/makesrna/intern/rna_image_api.c
source/blender/makesrna/intern/rna_main_api.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_object.c
source/blender/makesrna/intern/rna_object_api.c
source/blender/makesrna/intern/rna_rigidbody.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/creator/creator_args.c

diff --cc CMakeLists.txt
Simple merge
index 8187971c6e7d6219fbaa8a0a459d7636faeb5903,ecb1cf875113e33345ecfb145b8bfecd71b66a9f..be983ebff4a39720dbcaafe1a1f38642cb80de92
@@@ -282,9 -287,9 +282,9 @@@ SUDO="sudo
  
  NO_BUILD=false
  NO_CONFIRM=false
 -USE_CXX11=false
 +USE_CXX11=true  # Mandatory in blender2.8
  
- PYTHON_VERSION="3.5.1"
+ PYTHON_VERSION="3.5.2"
  PYTHON_VERSION_MIN="3.5"
  PYTHON_FORCE_BUILD=false
  PYTHON_FORCE_REBUILD=false
index 3fa3f037600367b35d084e8fc0cc6c18ca2ee307,88c583b827e19bf1dba05ef4cedc00a4b32ba42d..c9335f659245b55db636ffcfe4105a0436a6b04f
  #include "DNA_screen_types.h"
  #include "DNA_object_force.h"
  #include "DNA_object_types.h"
+ #include "DNA_mask_types.h"
  #include "DNA_mesh_types.h"
  #include "DNA_modifier_types.h"
 -#include "DNA_particle_types.h"
  #include "DNA_linestyle_types.h"
  #include "DNA_actuator_types.h"
  #include "DNA_view3d_types.h"
@@@ -1374,26 -1476,20 +1376,43 @@@ void blo_do_versions_270(FileData *fd, 
                }
        }
  
+       /* To be added to next subversion bump! */
+       {
+               /* Mask primitive adding code was not initializing correctly id_type of its points' parent. */
+               for (Mask *mask = main->mask.first; mask; mask = mask->id.next) {
+                       for (MaskLayer *mlayer = mask->masklayers.first; mlayer; mlayer = mlayer->next) {
+                               for (MaskSpline *mspline = mlayer->splines.first; mspline; mspline = mspline->next) {
+                                       int i = 0;
+                                       for (MaskSplinePoint *mspoint = mspline->points; i < mspline->tot_point; mspoint++, i++) {
+                                               if (mspoint->parent.id_type == 0) {
+                                                       BKE_mask_parent_init(&mspoint->parent);
+                                               }
+                                       }
+                               }
+                       }
+               }
+       }
++
 +      {
 +              if (!DNA_struct_elem_find(fd->filesdna, "View3DDebug", "char", "background")) {
 +                      bScreen *screen;
 +
 +                      for (screen = main->screen.first; screen; screen = screen->id.next) {
 +                              ScrArea *sa;
 +                              for (sa = screen->areabase.first; sa; sa = sa->next) {
 +                                      SpaceLink *sl;
 +
 +                                      for (sl = sa->spacedata.first; sl; sl = sl->next) {
 +                                              switch (sl->spacetype) {
 +                                                      case SPACE_VIEW3D:
 +                                                      {
 +                                                              View3D *v3d = (View3D *)sl;
 +                                                              v3d->debug.background = V3D_DEBUG_BACKGROUND_NONE;
 +                                                      }
 +                                              }
 +                                      }
 +                              }
 +                      }
 +              }
 +      }
  }
Simple merge
Simple merge