[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37414] branches/soc-2011-garlic: accident when merge.
xiao xiangquan
xiaoxiangquan at gmail.com
Sat Jun 11 20:15:47 CEST 2011
Revision: 37414
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37414
Author: xiaoxiangquan
Date: 2011-06-11 18:15:46 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
accident when merge. revert to 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/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/blender/windowmanager/CMakeLists.txt
branches/soc-2011-garlic/source/blenderplayer/CMakeLists.txt
branches/soc-2011-garlic/source/creator/CMakeLists.txt
branches/soc-2011-garlic/source/creator/creator.c
Modified: branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake
===================================================================
--- branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake 2011-06-11 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/build_files/cmake/FindPythonLibsUnix.cmake 2011-06-11 18:15:46 UTC (rev 37414)
@@ -53,17 +53,8 @@
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 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/build_files/cmake/macros.cmake 2011-06-11 18:15:46 UTC (rev 37414)
@@ -5,25 +5,14 @@
# use it instead of include_directories()
macro(blender_include_dirs
includes)
- set(_ALL_INCS "")
- foreach(_INC ${ARGV})
- get_filename_component(_ABS_INC ${_INC} ABSOLUTE)
- list(APPEND _ALL_INCS ${_ABS_INC})
+
+ foreach(inc ${ARGV})
+ get_filename_component(abs_inc ${inc} ABSOLUTE)
+ list(APPEND all_incs ${abs_inc})
endforeach()
- include_directories(${_ALL_INCS})
- unset(_INC)
- unset(_ABS_INC)
- unset(_ALL_INCS)
+ include_directories(${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)
@@ -31,17 +20,14 @@
# 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()
@@ -197,11 +183,10 @@
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()
@@ -214,11 +199,10 @@
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)
@@ -475,13 +459,4 @@
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()
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 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/release/scripts/modules/console/complete_namespace.py 2011-06-11 18:15:46 UTC (rev 37414)
@@ -37,11 +37,6 @@
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
@@ -179,7 +174,7 @@
if type(obj) in (bool, float, int, str):
return []
# an extra char '[', '(' or '.' will be added
- if hasattr(obj, '__getitem__') and not is_struct_seq(obj):
+ if hasattr(obj, '__getitem__'):
# 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 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/release/scripts/modules/console_python.py 2011-06-11 18:15:46 UTC (rev 37414)
@@ -80,7 +80,7 @@
if console_data:
console, stdout, stderr = console_data
- # XXX, bug in python 3.1.2, 3.2 ? (worked in 3.1.1)
+ # XXX, bug in python 3.1.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()
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 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-06-11 18:15:46 UTC (rev 37414)
@@ -99,9 +99,8 @@
split.prop(mesh, "show_double_sided")
-class DATA_PT_texture_space(MeshButtonsPanel, bpy.types.Panel):
- bl_label = "Texture Space"
- bl_options = {'DEFAULT_CLOSED'}
+class DATA_PT_settings(MeshButtonsPanel, bpy.types.Panel):
+ bl_label = "Settings"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
def draw(self, context):
@@ -110,14 +109,9 @@
mesh = context.mesh
layout.prop(mesh, "texture_mesh")
-
- layout.separator()
-
layout.prop(mesh, "use_auto_texspace")
- row = layout.row()
- row.column().prop(mesh, "texspace_location", text="Location")
- row.column().prop(mesh, "texspace_size", text="Size")
+
class DATA_PT_vertex_groups(MeshButtonsPanel, bpy.types.Panel):
bl_label = "Vertex Groups"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py 2011-06-11 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_metaball.py 2011-06-11 18:15:46 UTC (rev 37414)
@@ -70,10 +70,6 @@
layout.label(text="Update:")
layout.prop(mball, "update_method", expand=True)
-
- row = layout.row()
- row.column().prop(mball, "texspace_location")
- row.column().prop(mball, "texspace_size")
class DATA_PT_metaball_element(DataButtonsPanel, bpy.types.Panel):
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-06-11 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_modifier.py 2011-06-11 18:15:46 UTC (rev 37414)
@@ -483,10 +483,11 @@
col.label(text="Mode:")
col.prop(md, "wrap_method", text="")
+ split = layout.split(percentage=0.25)
+
+ col = split.column()
+
if md.wrap_method == 'PROJECT':
- split = layout.split(percentage=0.25)
-
- col = split.column()
col.label(text="Axis:")
col.prop(md, "use_project_x")
col.prop(md, "use_project_y")
@@ -498,6 +499,7 @@
col.prop(md, "use_positive_direction")
col = split.column()
+
col.label(text="Cull Faces:")
col.prop(md, "cull_face", expand=True)
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_render.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_render.py 2011-06-11 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_render.py 2011-06-11 18:15:46 UTC (rev 37414)
@@ -254,7 +254,8 @@
col.prop(rd, "use_compositing")
col.prop(rd, "use_sequencer")
- split.prop(rd, "dither_intensity", text="Dither", slider=True)
+ col = split.column()
+ col.prop(rd, "dither_intensity", text="Dither", slider=True)
layout.separator()
Modified: branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c
===================================================================
--- branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c 2011-06-11 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c 2011-06-11 18:15:46 UTC (rev 37414)
@@ -180,6 +180,7 @@
BLI_bpathIterator_free(bpi);
for(scene= main->scene.first; scene; scene= scene->id.next) {
+ BLI_clean(scene->r.backbuf);
BLI_clean(scene->r.pic);
}
}
Modified: branches/soc-2011-garlic/source/blender/blenkernel/intern/scene.c
===================================================================
--- branches/soc-2011-garlic/source/blender/blenkernel/intern/scene.c 2011-06-11 17:05:20 UTC (rev 37413)
+++ branches/soc-2011-garlic/source/blender/blenkernel/intern/scene.c 2011-06-11 18:15:46 UTC (rev 37414)
@@ -475,7 +475,8 @@
sce->audio.doppler_factor = 1.0;
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list