Revision: 36890
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36890
Author: kupoman
Date: 2011-05-25 07:06:56 +0000 (Wed, 25 May 2011)
Log Message:
-----------
Merging from trunk r36889
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36889
Modified Paths:
--------------
branches/soc-2011-cucumber/CMakeLists.txt
branches/soc-2011-cucumber/build_files/cmake/macros.cmake
branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
branches/soc-2011-cucumber/intern/bsp/CMakeLists.txt
branches/soc-2011-cucumber/intern/bsp/SConscript
branches/soc-2011-cucumber/intern/container/CTR_TaggedIndex.h
branches/soc-2011-cucumber/intern/decimation/CMakeLists.txt
branches/soc-2011-cucumber/intern/decimation/SConscript
branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCocoa.mm
branches/soc-2011-cucumber/release/scripts/modules/bpy_extras/io_utils.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-cucumber/source/blender/blenlib/intern/BLI_kdopbvh.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/pbvh.c
branches/soc-2011-cucumber/source/blender/blenlib/intern/rct.c
branches/soc-2011-cucumber/source/blender/blenloader/BLO_readfile.h
branches/soc-2011-cucumber/source/blender/blenloader/intern/readfile.c
branches/soc-2011-cucumber/source/blender/editors/animation/keyframes_draw.c
branches/soc-2011-cucumber/source/blender/editors/armature/editarmature.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_view3d.h
branches/soc-2011-cucumber/source/blender/editors/physics/particle_edit.c
branches/soc-2011-cucumber/source/blender/editors/screen/screen_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_graph/graph_select.c
branches/soc-2011-cucumber/source/blender/editors/space_sequencer/sequencer_select.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-cucumber/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-cucumber/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-cucumber/source/blender/imbuf/intern/targa.c
branches/soc-2011-cucumber/source/blender/makesdna/intern/makesdna.c
branches/soc-2011-cucumber/source/blender/modifiers/intern/MOD_displace.c
branches/soc-2011-cucumber/source/blender/python/generic/bgl.c
branches/soc-2011-cucumber/source/blender/python/generic/blf_py_api.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Color.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Euler.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Matrix.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Quaternion.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_Vector.c
branches/soc-2011-cucumber/source/blender/python/generic/mathutils_geometry.c
branches/soc-2011-cucumber/source/blender/python/generic/noise_py_api.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_library.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_props.c
branches/soc-2011-cucumber/source/blender/python/intern/bpy_rna.c
branches/soc-2011-cucumber/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2011-cucumber/source/creator/CMakeLists.txt
Property Changed:
----------------
branches/soc-2011-cucumber/
branches/soc-2011-cucumber/release/scripts/modules/bpy/ops.py
branches/soc-2011-cucumber/release/scripts/modules/bpy/utils.py
branches/soc-2011-cucumber/release/scripts/presets/sss/chicken.py
branches/soc-2011-cucumber/release/scripts/presets/sss/cream.py
branches/soc-2011-cucumber/release/scripts/presets/sss/ketchup.py
branches/soc-2011-cucumber/release/scripts/presets/sss/marble.py
branches/soc-2011-cucumber/release/scripts/presets/sss/potato.py
branches/soc-2011-cucumber/release/scripts/presets/sss/skim_milk.py
branches/soc-2011-cucumber/release/scripts/presets/sss/skin1.py
branches/soc-2011-cucumber/release/scripts/presets/sss/skin2.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-cucumber/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-cucumber/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-cucumber/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2011-cucumber/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-cucumber/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-cucumber/source/blender/editors/include/ED_particle.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_physics.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_render.h
branches/soc-2011-cucumber/source/blender/editors/include/ED_transform.h
branches/soc-2011-cucumber/source/blender/editors/interface/interface_intern.h
branches/soc-2011-cucumber/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-cucumber/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-cucumber/source/blender/editors/object/object_add.c
branches/soc-2011-cucumber/source/blender/editors/object/object_constraint.c
branches/soc-2011-cucumber/source/blender/editors/object/object_group.c
branches/soc-2011-cucumber/source/blender/editors/object/object_hook.c
branches/soc-2011-cucumber/source/blender/editors/object/object_lattice.c
branches/soc-2011-cucumber/source/blender/editors/object/object_relations.c
branches/soc-2011-cucumber/source/blender/editors/object/object_select.c
branches/soc-2011-cucumber/source/blender/editors/object/object_shapekey.c
branches/soc-2011-cucumber/source/blender/editors/object/object_transform.c
branches/soc-2011-cucumber/source/blender/editors/object/object_vgroup.c
branches/soc-2011-cucumber/source/blender/editors/physics/particle_boids.c
branches/soc-2011-cucumber/source/blender/editors/physics/particle_edit.c
branches/soc-2011-cucumber/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-cucumber/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-cucumber/source/blender/editors/render/
branches/soc-2011-cucumber/source/blender/editors/render/render_intern.h
branches/soc-2011-cucumber/source/blender/editors/render/render_preview.c
branches/soc-2011-cucumber/source/blender/editors/render/render_shading.c
branches/soc-2011-cucumber/source/blender/editors/render/render_update.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-cucumber/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-cucumber/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-cucumber/source/blender/editors/space_info/info_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_edit.c
branches/soc-2011-cucumber/source/blender/editors/space_node/node_state.c
branches/soc-2011-cucumber/source/blender/editors/space_text/text_ops.c
branches/soc-2011-cucumber/source/blender/editors/space_userpref/
branches/soc-2011-cucumber/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2011-cucumber/source/blender/editors/space_userpref/userpref_intern.h
branches/soc-2011-cucumber/source/blender/editors/space_userpref/userpref_ops.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-cucumber/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-cucumber/source/blender/gpu/GPU_buffers.h
branches/soc-2011-cucumber/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2011-cucumber/source/blender/makesrna/intern/rna_sculpt_paint.c
Property changes on: branches/soc-2011-cucumber
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/blender:36829-36889
Modified: branches/soc-2011-cucumber/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/CMakeLists.txt 2011-05-25 03:04:31 UTC (rev
36889)
+++ branches/soc-2011-cucumber/CMakeLists.txt 2011-05-25 07:06:56 UTC (rev
36890)
@@ -55,33 +55,19 @@
# quiet output for Makefiles, 'make -s' helps too
# set_property(GLOBAL PROPERTY RULE_MESSAGES OFF)
-# ignore system set flag, use our own
-# must be before project(...)
-# if the user wants to add their own its ok after first run.
-if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
- set(_reset_standard_libraries OFF)
-else()
- set(_reset_standard_libraries ON)
-endif()
+#-----------------------------------------------------------------------------
+# Load some macros.
+include(build_files/cmake/macros.cmake)
-project(Blender)
+#-----------------------------------------------------------------------------
+# Initialize project.
+blender_project_hack_pre()
-if (_reset_standard_libraries)
- # Must come after project(...)
- #
- # MINGW workaround for -ladvapi32 being included which surprisingly
causes
- # string formatting of floats, eg: printf("%.*f", 3, value). to crash
blender
- # with a meaningless stack trace. by overriding this flag we ensure we
only
- # have libs we define and that cmake & scons builds match.
- set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
- set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
- mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
- mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
-endif()
-unset(_reset_standard_libraries)
+project(Blender)
+blender_project_hack_post()
enable_testing()
@@ -92,10 +78,6 @@
set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib CACHE INTERNAL "" FORCE )
#-----------------------------------------------------------------------------
-# Load some macros.
-include(build_files/cmake/macros.cmake)
-
-#-----------------------------------------------------------------------------
# Set default config options
get_blender_version()
@@ -984,6 +966,12 @@
#-----------------------------------------------------------------------------
# Common.
+if(APPLE OR WIN32)
+ if(NOT IS_DIRECTORY "${LIBDIR}")
+ message(FATAL_ERROR "Apple and Windows require pre-compiled
libs at: '${LIBDIR}'")
+ endif()
+endif()
+
if(WITH_RAYOPTIMIZATION)
if(CMAKE_COMPILER_IS_GNUCC)
if(SUPPORT_SSE_BUILD)
@@ -1144,9 +1132,9 @@
#-------------------------------------------------------------------------------
# Global Defines
-# better not define flags here but this is a debugging option thats off by
default.
+# better not set includes here but this debugging option is off by default.
if(WITH_CXX_GUARDEDALLOC)
- set(CMAKE_CXX_FLAGS " -DWITH_CXX_GUARDEDALLOC
-I${CMAKE_SOURCE_DIR}/intern/guardedalloc ${CMAKE_CXX_FLAGS}")
+ include_directories(${CMAKE_SOURCE_DIR}/intern/guardedalloc)
endif()
if(WITH_ASSERT_ABORT)
Modified: branches/soc-2011-cucumber/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-cucumber/build_files/cmake/macros.cmake 2011-05-25
03:04:31 UTC (rev 36889)
+++ branches/soc-2011-cucumber/build_files/cmake/macros.cmake 2011-05-25
07:06:56 UTC (rev 36890)
@@ -388,3 +388,71 @@
# message(STATUS "Version (Internal):
${BLENDER_VERSION}.${BLENDER_SUBVERSION}, Version (external):
${BLENDER_VERSION}${BLENDER_VERSION_CHAR}-${BLENDER_VERSION_CYCLE}")
endmacro()
+
+
+# hacks to override initial project settings
+# these macros must be called directly before/after project(Blender)
+macro(blender_project_hack_pre)
+ # ----------------
+ # MINGW HACK START
+ # ignore system set flag, use our own
+ # must be before project(...)
+ # if the user wants to add their own its ok after first run.
+ if(DEFINED CMAKE_C_STANDARD_LIBRARIES)
+ set(_reset_standard_libraries OFF)
+ else()
+ set(_reset_standard_libraries ON)
+ endif()
+
+ # ------------------
+ # GCC -O3 HACK START
+ # needed because O3 can cause problems but
+ # allow the builder to set O3 manually after.
+ if(DEFINED CMAKE_C_FLAGS_RELEASE)
+ set(_reset_standard_cflags_rel OFF)
+ else()
+ set(_reset_standard_cflags_rel ON)
+ endif()
+ if(DEFINED CMAKE_CXX_FLAGS_RELEASE)
+ set(_reset_standard_cxxflags_rel OFF)
+ else()
+ set(_reset_standard_cxxflags_rel ON)
+ endif()
+endmacro()
+
+
+macro(blender_project_hack_post)
+ # --------------
+ # MINGW HACK END
+ if (_reset_standard_libraries)
+ # Must come after project(...)
+ #
+ # MINGW workaround for -ladvapi32 being included which
surprisingly causes
+ # string formatting of floats, eg: printf("%.*f", 3, value). to
crash blender
+ # with a meaningless stack trace. by overriding this flag we
ensure we only
+ # have libs we define and that cmake & scons builds match.
+ set(CMAKE_C_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+ set(CMAKE_CXX_STANDARD_LIBRARIES "" CACHE STRING "" FORCE)
+ mark_as_advanced(CMAKE_C_STANDARD_LIBRARIES)
+ mark_as_advanced(CMAKE_CXX_STANDARD_LIBRARIES)
+ endif()
+ unset(_reset_standard_libraries)
+
+
+ # ----------------
+ # GCC -O3 HACK END
+ if(_reset_standard_cflags_rel)
+ string(REGEX REPLACE "-O3" "-O2" CMAKE_C_FLAGS_RELEASE
"${CMAKE_C_FLAGS_RELEASE}")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}" CACHE
STRING "" FORCE)
+ mark_as_advanced(CMAKE_C_FLAGS_RELEASE)
+ endif()
+
+ if(_reset_standard_cxxflags_rel)
+ string(REGEX REPLACE "-O3" "-O2" CMAKE_CXX_FLAGS_RELEASE
"${CMAKE_CXX_FLAGS_RELEASE}")
+ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE}" CACHE
STRING "" FORCE)
+ mark_as_advanced(CMAKE_CXX_FLAGS_RELEASE)
+ endif()
+
+ unset(_reset_standard_cflags_rel)
+ unset(_reset_standard_cxxflags_rel)
+endmacro()
Modified:
branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
===================================================================
---
branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
2011-05-25 03:04:31 UTC (rev 36889)
+++
branches/soc-2011-cucumber/doc/python_api/examples/bpy.types.BlendDataLibraries.load.py
2011-05-25 07:06:56 UTC (rev 36890)
@@ -21,3 +21,19 @@
with bpy.data.libraries.load(filepath) as (data_from, data_to):
for attr in dir(data_to):
setattr(data_to, attr, getattr(data_from, attr))
+
+
+# the 'data_to' variables lists are
+with bpy.data.libraries.load(filepath) as (data_from, data_to):
+ data_to.scenes = ["Scene"]
+
+
+# the loaded objects can be accessed from 'data_to' outside of the context
+# since loading the data replaces the strings for the datablocks or None
+# if the datablock could not be loaded.
+with bpy.data.libraries.load(filepath) as (data_from, data_to):
+ data_to.meshes = data_from.meshes
+# now operate directly on the loaded data
+for mesh in data_to.meshes:
+ if mesh is not None:
+ print(mesh.name)
Modified: branches/soc-2011-cucumber/intern/bsp/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/intern/bsp/CMakeLists.txt 2011-05-25
03:04:31 UTC (rev 36889)
+++ branches/soc-2011-cucumber/intern/bsp/CMakeLists.txt 2011-05-25
07:06:56 UTC (rev 36890)
@@ -27,6 +27,7 @@
set(INC
./intern
../container
+ ../guardedalloc
../moto/include
../memutil
)
Modified: branches/soc-2011-cucumber/intern/bsp/SConscript
===================================================================
--- branches/soc-2011-cucumber/intern/bsp/SConscript 2011-05-25 03:04:31 UTC
(rev 36889)
+++ branches/soc-2011-cucumber/intern/bsp/SConscript 2011-05-25 07:06:56 UTC
(rev 36890)
@@ -3,7 +3,7 @@
sources = env.Glob('intern/*.cpp')
-incs = 'intern ../container ../moto/include ../memutil'
+incs = 'intern ../container ../moto/include ../memutil ../guardedalloc'
env.BlenderLib ('bf_intern_bsp', sources, Split(incs), [],
libtype=['core','player'], priority=[200,100] )
Modified: branches/soc-2011-cucumber/intern/container/CTR_TaggedIndex.h
===================================================================
--- branches/soc-2011-cucumber/intern/container/CTR_TaggedIndex.h
2011-05-25 03:04:31 UTC (rev 36889)
+++ branches/soc-2011-cucumber/intern/container/CTR_TaggedIndex.h
2011-05-25 07:06:56 UTC (rev 36890)
@@ -52,6 +52,8 @@
#include <functional>
+#include "MEM_sys_types.h"
+
enum {
empty_tag = 0x0,
@@ -100,9 +102,9 @@
#if defined(_WIN64)
CTR_TaggedIndex(
- const unsigned __int64 val
+ const uint64_t val
) :
- m_val ( ((unsigned __int64)val & index_mask)
+ m_val ( ((uint64_t)val & index_mask)
| ( (empty_tag << tag_shift)
& (~index_mask) ) ) {
}
@@ -140,8 +142,8 @@
}
#if defined(_WIN64)
- operator unsigned __int64 () const {
- return (unsigned __int64)(m_val & index_mask);
+ operator uint64_t () const {
+ return (uint64_t)(m_val & index_mask);
}
#endif
Modified: branches/soc-2011-cucumber/intern/decimation/CMakeLists.txt
===================================================================
--- branches/soc-2011-cucumber/intern/decimation/CMakeLists.txt 2011-05-25
03:04:31 UTC (rev 36889)
+++ branches/soc-2011-cucumber/intern/decimation/CMakeLists.txt 2011-05-25
07:06:56 UTC (rev 36890)
@@ -27,6 +27,7 @@
set(INC
.
../container
+ ../guardedalloc
../memutil
../moto/include
)
Modified: branches/soc-2011-cucumber/intern/decimation/SConscript
===================================================================
--- branches/soc-2011-cucumber/intern/decimation/SConscript 2011-05-25
03:04:31 UTC (rev 36889)
+++ branches/soc-2011-cucumber/intern/decimation/SConscript 2011-05-25
07:06:56 UTC (rev 36890)
@@ -3,6 +3,6 @@
sources = env.Glob('intern/*.cpp')
-incs = '. ../moto/include ../container ../memutil'
+incs = '. ../moto/include ../container ../memutil ../guardedalloc'
env.BlenderLib ('bf_intern_decimate', sources, Split(incs) , [],
libtype=['core', 'player'], priority = [200, 100] )
Modified: branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCocoa.mm
===================================================================
--- branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCocoa.mm
2011-05-25 03:04:31 UTC (rev 36889)
+++ branches/soc-2011-cucumber/intern/ghost/intern/GHOST_WindowCocoa.mm
2011-05-25 07:06:56 UTC (rev 36890)
@@ -461,9 +461,13 @@
GHOST_WindowCocoa::~GHOST_WindowCocoa()
{
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
