svn merge ^/trunk/blender -r44076:44118
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 12:08:06 +0000 (12:08 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Feb 2012 12:08:06 +0000 (12:08 +0000)
1  2 
source/blender/editors/object/object_edit.c
source/blender/makesrna/intern/rna_scene.c
source/creator/CMakeLists.txt

index a7ac91d13dfff6a06ca06416024720f4dabaf32c,1286ac850f6adbeb19598919dbe0fcf0d4afe797..b8cc749888c38e36cf9461e29ca898417394adab
@@@ -79,7 -79,6 +79,7 @@@
  #include "BKE_sca.h"
  #include "BKE_softbody.h"
  #include "BKE_modifier.h"
 +#include "BKE_tessmesh.h"
  
  #include "ED_armature.h"
  #include "ED_curve.h"
@@@ -322,18 -321,18 +322,18 @@@ void ED_object_exit_editmode(bContext *
                
  //            if(EM_texFaceCheck())
                
 -              if(me->edit_mesh->totvert>MESH_MAX_VERTS) {
 +              if(me->edit_btmesh->bm->totvert>MESH_MAX_VERTS) {
                        error("Too many vertices");
                        return;
                }
 -              load_editMesh(scene, obedit);
 +              
 +              EDBM_LoadEditBMesh(scene, obedit);
                
                if(freedata) {
 -                      free_editMesh(me->edit_mesh);
 -                      MEM_freeN(me->edit_mesh);
 -                      me->edit_mesh= NULL;
 +                      EDBM_FreeEditBMesh(me->edit_btmesh);
 +                      MEM_freeN(me->edit_btmesh);
 +                      me->edit_btmesh= NULL;
                }
 -              
                if(obedit->restore_mode & OB_MODE_WEIGHT_PAINT) {
                        mesh_octree_table(NULL, NULL, NULL, 'e');
                        mesh_mirrtopo_table(NULL, 'e');
@@@ -443,7 -442,7 +443,7 @@@ void ED_object_enter_editmode(bContext 
                ok= 1;
                scene->obedit= ob;      // context sees this
                
 -              make_editMesh(scene, ob);
 +              EDBM_MakeEditBMesh(CTX_data_tool_settings(C), scene, ob);
  
                WM_event_add_notifier(C, NC_SCENE|ND_MODE|NS_EDITMODE_MESH, scene);
        }
@@@ -1517,7 -1516,7 +1517,7 @@@ void OBJECT_OT_game_property_new(wmOper
        /* flags */
        ot->flag= OPTYPE_REGISTER|OPTYPE_UNDO;
  
-       RNA_def_enum(ot->srna, "type", gameproperty_type_items, 2, "Type", "Type of game property to add");
+       RNA_def_enum(ot->srna, "type", gameproperty_type_items, GPROP_FLOAT, "Type", "Type of game property to add");
        RNA_def_string(ot->srna, "name", "", MAX_NAME, "Name", "Name of the game property to add");
  }
  
index 9a94a98bfaf599e6c5f020b91148b92eb1d30805,f797368ac13ab92321749a60b1f67b77cc1b230e..7dc721930ef6cf94c06172512943b143a05fa7b9
@@@ -39,8 -39,6 +39,8 @@@
  #include "DNA_userdef_types.h"
  #include "BLI_math.h"
  
 +#include "BKE_tessmesh.h"
 +
  /* Include for Bake Options */
  #include "RE_engine.h"
  #include "RE_pipeline.h"
@@@ -823,16 -821,16 +823,16 @@@ static void rna_SceneRender_file_ext_ge
  #ifdef WITH_QUICKTIME
  static int rna_RenderSettings_qtcodecsettings_codecType_get(PointerRNA *ptr)
  {
-       RenderData *rd= (RenderData*)ptr->data;
+       QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
        
-       return quicktime_rnatmpvalue_from_videocodectype(rd->qtcodecsettings.codecType);
+       return quicktime_rnatmpvalue_from_videocodectype(settings->codecType);
  }
  
  static void rna_RenderSettings_qtcodecsettings_codecType_set(PointerRNA *ptr, int value)
  {
-       RenderData *rd= (RenderData*)ptr->data;
+       QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
  
-       rd->qtcodecsettings.codecType = quicktime_videocodecType_from_rnatmpvalue(value);
+       settings->codecType = quicktime_videocodecType_from_rnatmpvalue(value);
  }
  
  static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_codecType_itemf(bContext *C, PointerRNA *ptr,
  #ifdef USE_QTKIT
  static int rna_RenderSettings_qtcodecsettings_audiocodecType_get(PointerRNA *ptr)
  {
-       RenderData *rd= (RenderData*)ptr->data;
+       QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
        
-       return quicktime_rnatmpvalue_from_audiocodectype(rd->qtcodecsettings.audiocodecType);
+       return quicktime_rnatmpvalue_from_audiocodectype(settings->audiocodecType);
  }
  
  static void rna_RenderSettings_qtcodecsettings_audiocodecType_set(PointerRNA *ptr, int value)
  {
-       RenderData *rd= (RenderData*)ptr->data;
+       QuicktimeCodecSettings *settings = (QuicktimeCodecSettings*)ptr->data;
        
-       rd->qtcodecsettings.audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
+       settings->audiocodecType = quicktime_audiocodecType_from_rnatmpvalue(value);
  }
  
  static EnumPropertyItem *rna_RenderSettings_qtcodecsettings_audiocodecType_itemf(bContext *C, PointerRNA *ptr,
@@@ -1151,9 -1149,9 +1151,9 @@@ static void rna_Scene_editmesh_select_m
  
                if(scene->basact) {
                        Mesh *me= get_mesh(scene->basact->object);
 -                      if(me && me->edit_mesh && me->edit_mesh->selectmode != flag) {
 -                              me->edit_mesh->selectmode= flag;
 -                              EM_selectmode_set(me->edit_mesh);
 +                      if(me && me->edit_btmesh && me->edit_btmesh->selectmode != flag) {
 +                              me->edit_btmesh->selectmode= flag;
 +                              EDBM_selectmode_set(me->edit_btmesh);
                        }
                }
        }
@@@ -1165,7 -1163,7 +1165,7 @@@ static void rna_Scene_editmesh_select_m
  
        if(scene->basact) {
                me= get_mesh(scene->basact->object);
 -              if(me && me->edit_mesh==NULL)
 +              if(me && me->edit_btmesh==NULL)
                        me= NULL;
        }
  
index b91080fa56e8e0157d256bcb0700df9732ca347d,1b4d88a6f2e90fdd1726cec606d3bc45973ed1f9..19b3c6616ace0fe8850b003fe774f67b34e44127
@@@ -398,12 -398,21 +398,21 @@@ if(UNIX AND NOT APPLE
  
        if(WITH_PYTHON)
                if(WITH_PYTHON_INSTALL)
+                       # on some platforms (like openSUSE) Python is linked
+                       # to be used from lib64 folder.
+                       # determine this from Python's libraries path
+                       if(${PYTHON_LIBPATH} MATCHES "lib64$")
+                               set(_target_LIB "lib64")
+                       else()
+                               set(_target_LIB "lib")
+                       endif()
                        # Copy the systems python into the install directory
                        # Scons copy in tools/Blender.py
                        # install(CODE "message(\"copying a subset of the systems python...\")")
                        install(
                                DIRECTORY ${PYTHON_LIBPATH}/python${PYTHON_VERSION}
-                               DESTINATION ${TARGETDIR_VER}/python/lib
+                               DESTINATION ${TARGETDIR_VER}/python/${_target_LIB}
                                PATTERN ".svn" EXCLUDE
                                PATTERN "__pycache__" EXCLUDE               # * any cache *
                                PATTERN "distutils" EXCLUDE                 # ./distutils
  
                        # # doesnt work, todo
                        # install(CODE "execute_process(COMMAND find ${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {} '\;')")
+                       unset(_target_LIB)
                endif()
        endif()
  elseif(WIN32)
@@@ -787,7 -797,6 +797,7 @@@ endif(
                bf_python_ext
                bf_python_mathutils
                bf_ikplugin
 +              bf_bmesh
                bf_modifiers
                bf_blenkernel
                bf_nodes