[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37408] branches/soc-2011-garlic: merge from trunk r37405
xiao xiangquan
xiaoxiangquan at gmail.com
Sat Jun 11 14:48:14 CEST 2011
Revision: 37408
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37408
Author: xiaoxiangquan
Date: 2011-06-11 12:48:13 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
merge from trunk r37405
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37405
Modified Paths:
--------------
branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake
branches/soc-2011-garlic/build_files/cmake/macros.cmake
branches/soc-2011-garlic/release/scripts/modules/console/complete_namespace.py
branches/soc-2011-garlic/release/scripts/modules/console_python.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_render.py
branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/scene.c
branches/soc-2011-garlic/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-garlic/source/blender/editors/include/ED_particle.h
branches/soc-2011-garlic/source/blender/editors/interface/interface_intern.h
branches/soc-2011-garlic/source/blender/editors/object/object_add.c
branches/soc-2011-garlic/source/blender/editors/object/object_shapekey.c
branches/soc-2011-garlic/source/blender/editors/object/object_vgroup.c
branches/soc-2011-garlic/source/blender/editors/physics/particle_edit.c
branches/soc-2011-garlic/source/blender/editors/render/render_view.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_intern.h
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-garlic/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-garlic/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_userdef_types.h
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_userdef.c
branches/soc-2011-garlic/source/blender/render/intern/include/render_types.h
branches/soc-2011-garlic/source/blender/render/intern/source/convertblender.c
branches/soc-2011-garlic/source/blender/render/intern/source/envmap.c
branches/soc-2011-garlic/source/blender/render/intern/source/pipeline.c
branches/soc-2011-garlic/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-garlic/source/blenderplayer/CMakeLists.txt
branches/soc-2011-garlic/source/creator/CMakeLists.txt
branches/soc-2011-garlic/source/creator/creator.c
Property Changed:
----------------
branches/soc-2011-garlic/
branches/soc-2011-garlic/release/scripts/modules/bpy/ops.py
branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py
branches/soc-2011-garlic/release/scripts/presets/sss/chicken.py
branches/soc-2011-garlic/release/scripts/presets/sss/cream.py
branches/soc-2011-garlic/release/scripts/presets/sss/ketchup.py
branches/soc-2011-garlic/release/scripts/presets/sss/marble.py
branches/soc-2011-garlic/release/scripts/presets/sss/potato.py
branches/soc-2011-garlic/release/scripts/presets/sss/skim_milk.py
branches/soc-2011-garlic/release/scripts/presets/sss/skin1.py
branches/soc-2011-garlic/release/scripts/presets/sss/skin2.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/soc-2011-garlic/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_armature.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_bone.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_camera.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_empty.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_game.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_particle.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_physics_field.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_texture.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_world.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_node.py
branches/soc-2011-garlic/source/blender/blenkernel/BKE_customdata_file.h
branches/soc-2011-garlic/source/blender/blenkernel/intern/customdata_file.c
branches/soc-2011-garlic/source/blender/editors/datafiles/startup.blend.c
branches/soc-2011-garlic/source/blender/editors/include/ED_particle.h
branches/soc-2011-garlic/source/blender/editors/include/ED_physics.h
branches/soc-2011-garlic/source/blender/editors/include/ED_render.h
branches/soc-2011-garlic/source/blender/editors/include/ED_transform.h
branches/soc-2011-garlic/source/blender/editors/interface/interface_intern.h
branches/soc-2011-garlic/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-garlic/source/blender/editors/metaball/mball_edit.c
branches/soc-2011-garlic/source/blender/editors/object/object_add.c
branches/soc-2011-garlic/source/blender/editors/object/object_constraint.c
branches/soc-2011-garlic/source/blender/editors/object/object_group.c
branches/soc-2011-garlic/source/blender/editors/object/object_hook.c
branches/soc-2011-garlic/source/blender/editors/object/object_lattice.c
branches/soc-2011-garlic/source/blender/editors/object/object_relations.c
branches/soc-2011-garlic/source/blender/editors/object/object_select.c
branches/soc-2011-garlic/source/blender/editors/object/object_shapekey.c
branches/soc-2011-garlic/source/blender/editors/object/object_transform.c
branches/soc-2011-garlic/source/blender/editors/object/object_vgroup.c
branches/soc-2011-garlic/source/blender/editors/physics/particle_boids.c
branches/soc-2011-garlic/source/blender/editors/physics/particle_edit.c
branches/soc-2011-garlic/source/blender/editors/physics/physics_fluid.c
branches/soc-2011-garlic/source/blender/editors/physics/physics_pointcache.c
branches/soc-2011-garlic/source/blender/editors/render/
branches/soc-2011-garlic/source/blender/editors/render/render_intern.h
branches/soc-2011-garlic/source/blender/editors/render/render_preview.c
branches/soc-2011-garlic/source/blender/editors/render/render_shading.c
branches/soc-2011-garlic/source/blender/editors/render/render_update.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/sculpt.c
branches/soc-2011-garlic/source/blender/editors/space_image/image_buttons.c
branches/soc-2011-garlic/source/blender/editors/space_info/info_ops.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_state.c
branches/soc-2011-garlic/source/blender/editors/space_text/text_ops.c
branches/soc-2011-garlic/source/blender/editors/space_userpref/
branches/soc-2011-garlic/source/blender/editors/space_userpref/space_userpref.c
branches/soc-2011-garlic/source/blender/editors/space_userpref/userpref_intern.h
branches/soc-2011-garlic/source/blender/editors/space_userpref/userpref_ops.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_buttons.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_intern.h
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_parametrizer.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_parametrizer.h
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_unwrap_ops.c
branches/soc-2011-garlic/source/blender/gpu/GPU_buffers.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_outliner_types.h
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_sculpt_paint.c
Property changes on: branches/soc-2011-garlic
___________________________________________________________________
Added: svn:mergeinfo
+ /trunk/blender:37070-37405
Modified: branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake 2011-06-11 12:10:01 UTC (rev 37407)
+++ branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake 2011-06-11 12:48:13 UTC (rev 37408)
@@ -53,8 +53,17 @@
if(NOT _Found_PYTHON_H)
message(FATAL_ERROR "Python.h not found")
endif()
+
+ unset(_Found_PYTHON_H)
+ unset(_Python_HEADER)
+ unset(_CURRENT_ABI_FLAGS)
+ unset(_CURRENT_PATH)
+
endif()
+unset(_Python_ABI_FLAGS)
+unset(_Python_PATHS)
+
#=============================================================================
# now the python versions are found
Modified: branches/soc-2011-garlic/build_files/cmake/macros.cmake
===================================================================
--- branches/soc-2011-garlic/build_files/cmake/macros.cmake 2011-06-11 12:10:01 UTC (rev 37407)
+++ branches/soc-2011-garlic/build_files/cmake/macros.cmake 2011-06-11 12:48:13 UTC (rev 37408)
@@ -5,14 +5,25 @@
# use it instead of include_directories()
macro(blender_include_dirs
includes)
-
- foreach(inc ${ARGV})
- get_filename_component(abs_inc ${inc} ABSOLUTE)
- list(APPEND all_incs ${abs_inc})
+ set(_ALL_INCS "")
+ foreach(_INC ${ARGV})
+ get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+ list(APPEND _ALL_INCS ${_ABS_INC})
endforeach()
- include_directories(${all_incs})
+ include_directories(${_ALL_INCS})
+ unset(_INC)
+ unset(_ABS_INC)
+ unset(_ALL_INCS)
endmacro()
+ set(_ALL_INCS "")
+ foreach(_INC ${ARGV})
+ get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
+ list(APPEND _ALL_INCS ${_ABS_INC})
+ include_directories(SYSTEM ${_ALL_INCS})
+ unset(_INC)
+ unset(_ABS_INC)
+ unset(_ALL_INCS)
macro(blender_source_group
sources)
@@ -20,14 +31,17 @@
# Group by location on disk
source_group("Source Files" FILES CMakeLists.txt)
- foreach(SRC ${sources})
- get_filename_component(SRC_EXT ${SRC} EXT)
- if(${SRC_EXT} MATCHES ".h" OR ${SRC_EXT} MATCHES ".hpp")
- source_group("Header Files" FILES ${SRC})
+ foreach(_SRC ${sources})
+ get_filename_component(_SRC_EXT ${_SRC} EXT)
+ if(${_SRC_EXT} MATCHES ".h" OR ${_SRC_EXT} MATCHES ".hpp")
+ source_group("Header Files" FILES ${_SRC})
else()
- source_group("Source Files" FILES ${SRC})
+ source_group("Source Files" FILES ${_SRC})
endif()
endforeach()
+
+ unset(_SRC)
+ unset(_SRC_EXT)
endmacro()
@@ -183,10 +197,11 @@
endif()
if(WITH_IMAGE_OPENEXR)
if(WIN32 AND NOT UNIX)
- foreach(loop_var ${OPENEXR_LIB})
- target_link_libraries(${target} debug ${loop_var}_d)
- target_link_libraries(${target} optimized ${loop_var})
+ foreach(_LOOP_VAR ${OPENEXR_LIB})
+ target_link_libraries(${target} debug ${_LOOP_VAR}_d)
+ target_link_libraries(${target} optimized ${_LOOP_VAR})
endforeach()
+ unset(_LOOP_VAR)
else()
target_link_libraries(${target} ${OPENEXR_LIB})
endif()
@@ -199,10 +214,11 @@
endif()
if(WITH_OPENCOLLADA)
if(WIN32 AND NOT UNIX)
- foreach(loop_var ${OPENCOLLADA_LIB})
- target_link_libraries(${target} debug ${loop_var}_d)
- target_link_libraries(${target} optimized ${loop_var})
+ foreach(_LOOP_VAR ${OPENCOLLADA_LIB})
+ target_link_libraries(${target} debug ${_LOOP_VAR}_d)
+ target_link_libraries(${target} optimized ${_LOOP_VAR})
endforeach()
+ unset(_LOOP_VAR)
target_link_libraries(${target} debug ${PCRE_LIB}_d)
target_link_libraries(${target} optimized ${PCRE_LIB})
if(EXPAT_LIB)
@@ -459,4 +475,13 @@
unset(_reset_standard_cflags_rel)
unset(_reset_standard_cxxflags_rel)
+
+ # --------------------------------------------------
+ # workaround for omission in cmake 2.8.4's GNU.cmake
+ if(CMAKE_COMPILER_IS_GNUCC)
+ if(NOT DARWIN)
+ set(CMAKE_INCLUDE_SYSTEM_FLAG_C "-isystem ")
+ endif()
+ endif()
+
endmacro()
Property changes on: branches/soc-2011-garlic/release/scripts/modules/bpy/ops.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/modules/bpy/utils.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/soc-2011-garlic/release/scripts/modules/console/complete_namespace.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/modules/console/complete_namespace.py 2011-06-11 12:10:01 UTC (rev 37407)
+++ branches/soc-2011-garlic/release/scripts/modules/console/complete_namespace.py 2011-06-11 12:48:13 UTC (rev 37408)
@@ -37,6 +37,11 @@
return hasattr(obj, 'keys') and hasattr(getattr(obj, 'keys'), '__call__')
+def is_struct_seq(obj):
+ """Returns whether obj is a structured sequence subclass: sys.float_info"""
+ return isinstance(obj, tuple) and hasattr(obj, 'n_fields')
+
+
def complete_names(word, namespace):
"""Complete variable names or attributes
@@ -174,7 +179,7 @@
if type(obj) in (bool, float, int, str):
return []
# an extra char '[', '(' or '.' will be added
- if hasattr(obj, '__getitem__'):
+ if hasattr(obj, '__getitem__') and not is_struct_seq(obj):
# list or dictionary
matches = complete_indices(word, namespace, obj)
elif hasattr(obj, '__call__'):
Modified: branches/soc-2011-garlic/release/scripts/modules/console_python.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/modules/console_python.py 2011-06-11 12:10:01 UTC (rev 37407)
+++ branches/soc-2011-garlic/release/scripts/modules/console_python.py 2011-06-11 12:48:13 UTC (rev 37408)
@@ -80,7 +80,7 @@
if console_data:
console, stdout, stderr = console_data
- # XXX, bug in python 3.1.2 ? (worked in 3.1.1)
+ # XXX, bug in python 3.1.2, 3.2 ? (worked in 3.1.1)
# seems there is no way to clear StringIO objects for writing, have to make new ones each time.
import io
stdout = io.StringIO()
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/chicken.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/cream.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/ketchup.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/marble.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/potato.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/skim_milk.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/skin1.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/presets/sss/skin2.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Deleted: svn:mergeinfo
-
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-06-11 12:10:01 UTC (rev 37407)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-06-11 12:48:13 UTC (rev 37408)
@@ -99,8 +99,9 @@
split.prop(mesh, "show_double_sided")
-class DATA_PT_settings(MeshButtonsPanel, bpy.types.Panel):
- bl_label = "Settings"
+class DATA_PT_texture_space(MeshButtonsPanel, bpy.types.Panel):
+ bl_label = "Texture Space"
+ bl_options = {'DEFAULT_CLOSED'}
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def draw(self, context):
@@ -109,9 +110,14 @@
mesh = context.mesh
layout.prop(mesh, "texture_mesh")
+
+ layout.separator()
+
layout.prop(mesh, "use_auto_texspace")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list