svn merge ^/trunk/blender -r40405:40431
authorCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 11:30:55 +0000 (11:30 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 23 Sep 2011 11:30:55 +0000 (11:30 +0000)
1  2 
release/scripts/startup/bl_ui/properties_data_modifier.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenkernel/intern/object.c
source/blender/blenlib/intern/path_util.c
source/blender/blenlib/intern/threads.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/uvedit/uvedit_ops.c
source/blender/editors/uvedit/uvedit_unwrap_ops.c
source/blender/makesdna/DNA_modifier_types.h
source/blenderplayer/bad_level_call_stubs/stubs.c
source/creator/creator.c

@@@ -75,9 -75,7 +75,10 @@@ typedef enum ModifierType 
        eModifierType_WeightVGMix,
        eModifierType_WeightVGProximity,
        eModifierType_NavMesh,
+       eModifierType_DynamicPaint, /* reserve slot */
 +
 +      /* BMESH ONLY - keeps getting bumped by new modifiers in trunk */
 +      eModifierType_NgonInterp,
        NUM_MODIFIER_TYPES
  } ModifierType;
  
  #include <stdlib.h>
  #include <stddef.h>
  #include <string.h>
- /* for setuid / getuid */
- #ifdef __sgi
- #include <sys/types.h>
- #include <unistd.h>
- #endif
 +#include <signal.h>
 +
  
  /* This little block needed for linking to Blender... */
  
@@@ -1222,15 -1187,6 +1217,11 @@@ int main(int argc, const char **argv
  
        BLI_argsParse(ba, 1, NULL, NULL);
  
- #ifdef __sgi
-       setuid(getuid()); /* end superuser */
- #endif
 +      if (!no_handler) {
 +              signal(SIGSEGV, segmentation_handler);
 +              //signal(SIGFPE, segmentation_handler);
 +      }
 +
  #if defined(WITH_PYTHON_MODULE) || defined(WITH_HEADLESS)
        G.background= 1; /* python module mode ALWAYS runs in background mode (for now) */
  #else