[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40393] branches/soc-2011-garlic: Merging r40366 through r40392 from trunk into soc-2011-garlic
Sergey Sharybin
g.ulairi at gmail.com
Tue Sep 20 14:01:17 CEST 2011
Revision: 40393
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40393
Author: nazgul
Date: 2011-09-20 12:01:16 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
Merging r40366 through r40392 from trunk into soc-2011-garlic
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40366
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40392
Modified Paths:
--------------
branches/soc-2011-garlic/GNUmakefile
branches/soc-2011-garlic/build_files/cmake/cmake_static_check_splint.py
branches/soc-2011-garlic/build_files/scons/config/win64-vc-config.py
branches/soc-2011-garlic/doc/python_api/sphinx_doc_gen.py
branches/soc-2011-garlic/intern/smoke/CMakeLists.txt
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_material.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_info.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d.py
branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/soc-2011-garlic/source/blender/blenkernel/BKE_armature.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_blender.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_image.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_material.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_mesh.h
branches/soc-2011-garlic/source/blender/blenkernel/BKE_paint.h
branches/soc-2011-garlic/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/anim_sys.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/armature.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/blender.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/customdata.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/image.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/material.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/mesh.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/node.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/paint.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/sound.c
branches/soc-2011-garlic/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2011-garlic/source/blender/blenloader/intern/readfile.c
branches/soc-2011-garlic/source/blender/collada/GeometryExporter.cpp
branches/soc-2011-garlic/source/blender/collada/GeometryExporter.h
branches/soc-2011-garlic/source/blender/collada/MeshImporter.cpp
branches/soc-2011-garlic/source/blender/collada/MeshImporter.h
branches/soc-2011-garlic/source/blender/editors/armature/editarmature.c
branches/soc-2011-garlic/source/blender/editors/armature/meshlaplacian.c
branches/soc-2011-garlic/source/blender/editors/include/ED_mesh.h
branches/soc-2011-garlic/source/blender/editors/include/ED_view3d.h
branches/soc-2011-garlic/source/blender/editors/interface/interface_templates.c
branches/soc-2011-garlic/source/blender/editors/interface/view2d.c
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh.c
branches/soc-2011-garlic/source/blender/editors/mesh/editmesh_mods.c
branches/soc-2011-garlic/source/blender/editors/mesh/mesh_data.c
branches/soc-2011-garlic/source/blender/editors/mesh/meshtools.c
branches/soc-2011-garlic/source/blender/editors/object/object_intern.h
branches/soc-2011-garlic/source/blender/editors/object/object_ops.c
branches/soc-2011-garlic/source/blender/editors/object/object_vgroup.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_ops.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2011-garlic/source/blender/editors/sculpt_paint/paint_vertex.c
branches/soc-2011-garlic/source/blender/editors/sound/sound_ops.c
branches/soc-2011-garlic/source/blender/editors/space_action/action_select.c
branches/soc-2011-garlic/source/blender/editors/space_image/space_image.c
branches/soc-2011-garlic/source/blender/editors/space_logic/logic_ops.c
branches/soc-2011-garlic/source/blender/editors/space_nla/nla_select.c
branches/soc-2011-garlic/source/blender/editors/space_node/drawnode.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_edit.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_select.c
branches/soc-2011-garlic/source/blender/editors/space_node/node_state.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner_edit.c
branches/soc-2011-garlic/source/blender/editors/space_outliner/outliner_tree.c
branches/soc-2011-garlic/source/blender/editors/space_sequencer/sequencer_edit.c
branches/soc-2011-garlic/source/blender/editors/space_text/text_draw.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawobject.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_header.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2011-garlic/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2011-garlic/source/blender/editors/transform/transform.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_conversions.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_manipulator.c
branches/soc-2011-garlic/source/blender/editors/transform/transform_ops.c
branches/soc-2011-garlic/source/blender/editors/uvedit/uvedit_ops.c
branches/soc-2011-garlic/source/blender/gpu/GPU_draw.h
branches/soc-2011-garlic/source/blender/gpu/GPU_material.h
branches/soc-2011-garlic/source/blender/gpu/intern/gpu_draw.c
branches/soc-2011-garlic/source/blender/gpu/intern/gpu_material.c
branches/soc-2011-garlic/source/blender/makesdna/DNA_material_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_mesh_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_meshdata_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_object_types.h
branches/soc-2011-garlic/source/blender/makesdna/DNA_scene_types.h
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_curve.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_material.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_mesh.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_nodetree.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_object.c
branches/soc-2011-garlic/source/blender/makesrna/intern/rna_scene.c
branches/soc-2011-garlic/source/blender/modifiers/intern/MOD_uvproject.c
branches/soc-2011-garlic/source/blender/nodes/composite/node_composite_util.h
branches/soc-2011-garlic/source/blender/nodes/composite/nodes/node_composite_colorSpill.c
branches/soc-2011-garlic/source/blender/nodes/composite/nodes/node_composite_diffMatte.c
branches/soc-2011-garlic/source/blender/nodes/intern/node_common.c
branches/soc-2011-garlic/source/blender/render/intern/source/convertblender.c
branches/soc-2011-garlic/source/blender/render/intern/source/pixelshading.c
branches/soc-2011-garlic/source/blender/render/intern/source/pointdensity.c
branches/soc-2011-garlic/source/blender/render/intern/source/render_texture.c
branches/soc-2011-garlic/source/blender/render/intern/source/rendercore.c
branches/soc-2011-garlic/source/blender/render/intern/source/shadeoutput.c
branches/soc-2011-garlic/source/blender/render/intern/source/zbuf.c
branches/soc-2011-garlic/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2011-garlic/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_BlenderShader.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_BlenderShader.h
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_Material.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/BL_Material.h
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/soc-2011-garlic/source/gameengine/Ketsji/KX_PolygonMaterial.h
branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_IRasterizer.h
branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
branches/soc-2011-garlic/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
Property Changed:
----------------
branches/soc-2011-garlic/
branches/soc-2011-garlic/source/blender/editors/space_outliner/
Property changes on: branches/soc-2011-garlic
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:37070-37405,38788-40365
+ /trunk/blender:37070-37405,38788-40392
Modified: branches/soc-2011-garlic/GNUmakefile
===================================================================
--- branches/soc-2011-garlic/GNUmakefile 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/GNUmakefile 2011-09-20 12:01:16 UTC (rev 40393)
@@ -36,7 +36,7 @@
BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
BUILD_TYPE:=Release
-BUILD_CMAKE_ARGS:=""
+BUILD_CMAKE_ARGS:=
# -----------------------------------------------------------------------------
@@ -77,14 +77,24 @@
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
+
# -----------------------------------------------------------------------------
+# Macro for configuring cmake
+
+CMAKE_CONFIG = cmake $(BUILD_CMAKE_ARGS) \
+ -H$(BLENDER_DIR) \
+ -B$(BUILD_DIR) \
+ -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE)
+
+
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR) -DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
+ $(CMAKE_CONFIG); \
fi
@echo
@@ -186,12 +196,15 @@
#
check_cppcheck:
+ $(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_cppcheck.py
check_splint:
+ $(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_splint.py
check_sparse:
+ $(CMAKE_CONFIG)
cd $(BUILD_DIR) ; python3 $(BLENDER_DIR)/build_files/cmake/cmake_static_check_sparse.py
Modified: branches/soc-2011-garlic/build_files/cmake/cmake_static_check_splint.py
===================================================================
--- branches/soc-2011-garlic/build_files/cmake/cmake_static_check_splint.py 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/build_files/cmake/cmake_static_check_splint.py 2011-09-20 12:01:16 UTC (rev 40393)
@@ -58,6 +58,10 @@
# re-definitions, rna causes most of these
"-redef",
"-syntax",
+
+ # dummy, witjout this splint complains with:
+ # /usr/include/bits/confname.h:31:27: *** Internal Bug at cscannerHelp.c:2428: Unexpanded macro not function or constant: int _PC_MAX_CANON
+ "-D_PC_MAX_CANON=0",
]
Modified: branches/soc-2011-garlic/build_files/scons/config/win64-vc-config.py
===================================================================
--- branches/soc-2011-garlic/build_files/scons/config/win64-vc-config.py 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/build_files/scons/config/win64-vc-config.py 2011-09-20 12:01:16 UTC (rev 40393)
@@ -188,11 +188,6 @@
LLIBS = ['ws2_32', 'vfw32', 'winmm', 'kernel32', 'user32', 'gdi32', 'comdlg32', 'advapi32', 'shfolder', 'shell32', 'ole32', 'oleaut32', 'uuid']
-if BF_DEBUG:
- BF_NUMJOBS=1
-else:
- BF_NUMJOBS=6
-
PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:X64','/STACK:2097152','/OPT:NOREF','/INCREMENTAL:NO', '/NODEFAULTLIB:msvcrt.lib', '/NODEFAULTLIB:msvcmrt.lib', '/NODEFAULTLIB:msvcurt.lib', '/NODEFAULTLIB:msvcrtd.lib']
BF_BUILDDIR = '..\\build\\blender25-win64-vc'
Modified: branches/soc-2011-garlic/doc/python_api/sphinx_doc_gen.py
===================================================================
--- branches/soc-2011-garlic/doc/python_api/sphinx_doc_gen.py 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/doc/python_api/sphinx_doc_gen.py 2011-09-20 12:01:16 UTC (rev 40393)
@@ -1036,8 +1036,12 @@
fw("copyright = u'Blender Foundation'\n")
fw("version = '%s - API'\n" % version_string)
fw("release = '%s - API'\n" % version_string)
- fw("html_theme = 'blender-org'\n")
- fw("html_theme_path = ['../']\n")
+
+ # until we get a theme for 'Naiad'
+ if 0:
+ fw("html_theme = 'blender-org'\n")
+ fw("html_theme_path = ['../']\n")
+
fw("html_favicon = 'favicon.ico'\n")
# not helpful since the source us generated, adds to upload size.
fw("html_copy_source = False\n")
Modified: branches/soc-2011-garlic/intern/smoke/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/intern/smoke/CMakeLists.txt 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/intern/smoke/CMakeLists.txt 2011-09-20 12:01:16 UTC (rev 40393)
@@ -83,8 +83,13 @@
intern/tnt/tnt_version.h
)
+# quiet -Wundef
+add_definitions(-DDDF_DEBUG=0)
+
if(WITH_OPENMP)
add_definitions(-DPARALLEL=1)
+else()
+ add_definitions(-DPARALLEL=0)
endif()
if(WITH_FFTW3)
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-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_data_mesh.py 2011-09-20 12:01:16 UTC (rev 40393)
@@ -35,6 +35,10 @@
layout.operator("object.vertex_group_copy_to_selected", icon='LINK_AREA')
layout.operator("object.vertex_group_mirror", icon='ARROW_LEFTRIGHT')
layout.operator("object.vertex_group_remove", icon='X', text=_("Delete All")).all = True
+ layout.separator()
+ layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock All").action = 'SELECT'
+ layout.operator("object.vertex_group_lock", icon='UNLOCK', text="UnLock All").action = 'DESELECT'
+ layout.operator("object.vertex_group_lock", icon='LOCK', text="Lock Invert All").action = 'INVERT'
class MESH_MT_shape_key_specials(Menu):
@@ -285,53 +289,6 @@
layout.prop(lay, "name")
-class DATA_PT_texface(MeshButtonsPanel, Panel):
- bl_label = "Texture Face"
- COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
-
- @classmethod
- def poll(cls, context):
- obj = context.object
- return (context.mode == 'EDIT_MESH') and obj and obj.type == 'MESH'
-
- def draw(self, context):
- layout = self.layout
- col = layout.column()
-
- me = context.mesh
-
- tf = me.faces.active_tface
-
- if tf:
- if context.scene.render.engine != 'BLENDER_GAME':
- col.label(text=_("Options only supported in Game Engine"))
-
- split = layout.split()
- col = split.column()
-
- col.prop(tf, "use_image")
- col.prop(tf, "use_light")
- col.prop(tf, "hide")
- col.prop(tf, "use_collision")
-
- col.prop(tf, "use_blend_shared")
- col.prop(tf, "use_twoside")
- col.prop(tf, "use_object_color")
-
- col = split.column()
-
- col.prop(tf, "use_halo")
- col.prop(tf, "use_billboard")
- col.prop(tf, "use_shadow_cast")
- col.prop(tf, "use_bitmap_text")
- col.prop(tf, "use_alpha_sort")
-
- col = layout.column()
- col.prop(tf, "blend_type")
- else:
- col.label(text=_("No UV Texture"))
-
-
class DATA_PT_vertex_colors(MeshButtonsPanel, Panel):
bl_label = "Vertex Colors"
COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_GAME'}
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_material.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_material.py 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/properties_material.py 2011-09-20 12:01:16 UTC (rev 40393)
@@ -612,9 +612,37 @@
col.prop(halo, "flare_subflare_size", text=_("Subsize"))
-class MATERIAL_PT_physics(MaterialButtonsPanel, Panel):
+class MATERIAL_PT_game_settings(MaterialButtonsPanel, bpy.types.Panel):
+ bl_label = "Game Settings"
+ COMPAT_ENGINES = {'BLENDER_GAME'}
+
+ @classmethod
+ def poll(cls, context):
+ return context.material and (context.scene.render.engine in cls.COMPAT_ENGINES)
+
+ def draw(self, context):
+ layout = self.layout
+ game = context.material.game_settings # dont use node material
+
+ row = layout.row()
+ row.prop(game, "back_culling")
+ row.prop(game, "invisible")
+ row.prop(game, "text")
+
+ row = layout.row()
+ row.label(text="Alpha Blend:")
+ row.label(text="Face Orientation:")
+ row = layout.row()
+ row.prop(game,"alpha_blend",text="")
+ row.prop(game,"face_orientation",text="")
+
+class MATERIAL_PT_physics(MaterialButtonsPanel, bpy.types.Panel):
bl_label = "Physics"
COMPAT_ENGINES = {'BLENDER_GAME'}
+
+ def draw_header(self, context):
+ game = context.material.game_settings
+ self.layout.prop(game, "physics", text="")
@classmethod
def poll(cls, context):
@@ -622,6 +650,7 @@
def draw(self, context):
layout = self.layout
+ layout.active = context.material.game_settings.physics
phys = context.material.physics # dont use node material
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_info.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_info.py 2011-09-20 10:15:57 UTC (rev 40392)
+++ branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_info.py 2011-09-20 12:01:16 UTC (rev 40393)
@@ -381,6 +381,7 @@
layout.operator("wm.console_toggle", icon='CONSOLE')
layout.separator()
layout.operator("anim.update_data_paths", text=_("FCurve/Driver Version fix"), icon='HELP')
+ layout.operator("logic.texface_convert", text="TexFace to Material Convert", icon='GAME')
layout.separator()
layout.operator("wm.splash", icon='BLENDER')
Modified: branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/soc-2011-garlic/release/scripts/startup/bl_ui/space_view3d.py 2011-09-20 10:15:57 UTC (rev 40392)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list