[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [41481] branches/bmesh/blender: svn merge -r41458:41480 ^/trunk/blender
Campbell Barton
ideasman42 at gmail.com
Thu Nov 3 00:16:11 CET 2011
Revision: 41481
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41481
Author: campbellbarton
Date: 2011-11-02 23:16:10 +0000 (Wed, 02 Nov 2011)
Log Message:
-----------
svn merge -r41458:41480 ^/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=41458
Modified Paths:
--------------
branches/bmesh/blender/CMakeLists.txt
branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
branches/bmesh/blender/intern/ghost/CMakeLists.txt
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
branches/bmesh/blender/source/blender/blenkernel/BKE_depsgraph.h
branches/bmesh/blender/source/blender/blenkernel/BKE_node.h
branches/bmesh/blender/source/blender/blenkernel/BKE_scene.h
branches/bmesh/blender/source/blender/blenkernel/intern/anim_sys.c
branches/bmesh/blender/source/blender/blenkernel/intern/depsgraph.c
branches/bmesh/blender/source/blender/blenkernel/intern/ipo.c
branches/bmesh/blender/source/blender/blenkernel/intern/node.c
branches/bmesh/blender/source/blender/blenkernel/intern/object.c
branches/bmesh/blender/source/blender/blenkernel/intern/scene.c
branches/bmesh/blender/source/blender/blenkernel/intern/world.c
branches/bmesh/blender/source/blender/blenlib/BLI_callbacks.h
branches/bmesh/blender/source/blender/blenlib/CMakeLists.txt
branches/bmesh/blender/source/blender/blenlib/intern/path_util.c
branches/bmesh/blender/source/blender/blenloader/intern/readfile.c
branches/bmesh/blender/source/blender/blenloader/intern/writefile.c
branches/bmesh/blender/source/blender/editors/include/ED_node.h
branches/bmesh/blender/source/blender/editors/include/ED_render.h
branches/bmesh/blender/source/blender/editors/object/object_add.c
branches/bmesh/blender/source/blender/editors/object/object_edit.c
branches/bmesh/blender/source/blender/editors/render/render_preview.c
branches/bmesh/blender/source/blender/editors/render/render_shading.c
branches/bmesh/blender/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/sculpt_paint/sculpt.c
branches/bmesh/blender/source/blender/editors/space_node/node_draw.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_node/node_header.c
branches/bmesh/blender/source/blender/editors/space_node/space_node.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/space_view3d.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_draw.c
branches/bmesh/blender/source/blender/makesdna/DNA_ID.h
branches/bmesh/blender/source/blender/makesdna/DNA_lamp_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_object_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_space_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_view3d_types.h
branches/bmesh/blender/source/blender/makesdna/DNA_world_types.h
branches/bmesh/blender/source/blender/makesrna/intern/rna_ID.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_lamp.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_main_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_material.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_nodetree.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_render.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_scene_api.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_space.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_world.c
branches/bmesh/blender/source/blender/nodes/intern/node_common.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_tree.c
branches/bmesh/blender/source/blender/nodes/shader/node_shader_util.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_camera.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_curves.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_dynamic.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_geom.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_hueSatVal.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_invert.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mapping.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_material.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_math.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_mixRgb.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_normal.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_output.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_rgb.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_sepcombRGB.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_squeeze.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_texture.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_valToRgb.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_value.c
branches/bmesh/blender/source/blender/nodes/shader/nodes/node_shader_vectMath.c
branches/bmesh/blender/source/blender/python/intern/bpy_app_handlers.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Quaternion.c
branches/bmesh/blender/source/blender/render/extern/include/RE_engine.h
branches/bmesh/blender/source/blender/render/intern/include/render_types.h
branches/bmesh/blender/source/blender/render/intern/source/external_engine.c
branches/bmesh/blender/source/blender/render/intern/source/pipeline.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_draw.c
branches/bmesh/blender/source/blender/windowmanager/intern/wm_event_system.c
branches/bmesh/blender/source/blenderplayer/bad_level_call_stubs/stubs.c
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/
branches/bmesh/blender/source/blender/editors/space_outliner/
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:39992-41458
+ /trunk/blender:39992-41480
Modified: branches/bmesh/blender/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/CMakeLists.txt 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/CMakeLists.txt 2011-11-02 23:16:10 UTC (rev 41481)
@@ -157,6 +157,8 @@
if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON)
+ option(WITH_XDG_USER_DIRS "Build with XDG Base Directory Specification (only config and documents for now)" OFF)
+ mark_as_advanced(WITH_XDG_USER_DIRS)
else()
# not an option for other OS's
set(WITH_BUILTIN_GLEW ON)
Modified: branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake
===================================================================
--- branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/build_files/cmake/Modules/FindPythonLibsUnix.cmake 2011-11-02 23:16:10 UTC (rev 41481)
@@ -44,8 +44,19 @@
MARK_AS_ADVANCED(PYTHON_LINKFLAGS)
+# if the user passes these defines as args, we dont want to overwrite
+SET(_IS_INC_DEF OFF)
+SET(_IS_LIB_DEF OFF)
+IF(DEFINED PYTHON_INCLUDE_DIR)
+ SET(_IS_INC_DEF ON)
+ENDIF()
+IF(DEFINED PYTHON_LIBRARY)
+ SET(_IS_LIB_DEF ON)
+ENDIF()
+
+
# only search for the dirs if we havn't already
-IF((NOT DEFINED PYTHON_INCLUDE_DIR) OR (NOT DEFINED PYTHON_LIBRARY))
+IF((NOT _IS_INC_DEF) OR (NOT _IS_LIB_DEF))
SET(_python_ABI_FLAGS
"m;mu;u; " # release
@@ -66,30 +77,38 @@
#ENDIF()
STRING(REPLACE " " "" _CURRENT_ABI_FLAGS ${_CURRENT_ABI_FLAGS})
- FIND_PATH(PYTHON_INCLUDE_DIR
- NAMES
- Python.h
- HINTS
- ${_python_SEARCH_DIRS}
- PATH_SUFFIXES
- include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
- )
+ IF(NOT DEFINED PYTHON_INCLUDE_DIR)
+ FIND_PATH(PYTHON_INCLUDE_DIR
+ NAMES
+ Python.h
+ HINTS
+ ${_python_SEARCH_DIRS}
+ PATH_SUFFIXES
+ include/python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}
+ )
+ ENDIF()
- FIND_LIBRARY(PYTHON_LIBRARY
- NAMES
- "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
- HINTS
- ${_python_SEARCH_DIRS}
- PATH_SUFFIXES
- lib64 lib
- )
+ IF(NOT DEFINED PYTHON_LIBRARY)
+ FIND_LIBRARY(PYTHON_LIBRARY
+ NAMES
+ "python${PYTHON_VERSION}${_CURRENT_ABI_FLAGS}"
+ HINTS
+ ${_python_SEARCH_DIRS}
+ PATH_SUFFIXES
+ lib64 lib
+ )
+ ENDIF()
IF(PYTHON_LIBRARY AND PYTHON_INCLUDE_DIR)
break()
ELSE()
# ensure we dont find values from 2 different ABI versions
- UNSET(PYTHON_INCLUDE_DIR CACHE)
- UNSET(PYTHON_LIBRARY CACHE)
+ IF(NOT _IS_INC_DEF)
+ UNSET(PYTHON_INCLUDE_DIR CACHE)
+ ENDIF()
+ IF(NOT _IS_LIB_DEF)
+ UNSET(PYTHON_LIBRARY CACHE)
+ ENDIF()
ENDIF()
ENDFOREACH()
@@ -100,6 +119,9 @@
UNSET(_python_SEARCH_DIRS)
ENDIF()
+UNSET(_IS_INC_DEF)
+UNSET(_IS_LIB_DEF)
+
# handle the QUIETLY and REQUIRED arguments and SET PYTHONLIBSUNIX_FOUND to TRUE IF
# all listed variables are TRUE
INCLUDE(FindPackageHandleStandardArgs)
Modified: branches/bmesh/blender/intern/ghost/CMakeLists.txt
===================================================================
--- branches/bmesh/blender/intern/ghost/CMakeLists.txt 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/intern/ghost/CMakeLists.txt 2011-11-02 23:16:10 UTC (rev 41481)
@@ -108,6 +108,10 @@
)
endif()
+if(WITH_XDG_USER_DIRS)
+ add_definitions(-DWITH_XDG_USER_DIRS)
+endif()
+
if(WITH_HEADLESS OR WITH_GHOST_SDL)
if(WITH_HEADLESS)
list(APPEND SRC
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp 2011-11-02 23:16:10 UTC (rev 41481)
@@ -41,6 +41,11 @@
#include <stdio.h> // for fprintf only
#include <cstdlib> // for exit
+#ifdef WITH_XDG_USER_DIRS
+# include <pwd.h> // for get home without use getenv()
+# include <limits.h> // for PATH_MAX
+#endif
+
#ifdef PREFIX
static const char *static_path= PREFIX "/share" ;
#else
@@ -63,7 +68,27 @@
const GHOST_TUns8* GHOST_SystemPathsX11::getUserDir() const
{
+#ifndef WITH_XDG_USER_DIRS
return (const GHOST_TUns8 *)getenv("HOME");
+#else /* WITH_XDG_USER_DIRS */
+ const char *home= getenv("XDG_CONFIG_HOME");
+
+ if (home) {
+ return (const GHOST_TUns8 *)home;
+ }
+ else {
+ static char user_path[PATH_MAX];
+
+ home= getenv("HOME");
+
+ if (home == NULL) {
+ home= getpwuid(getuid())->pw_dir;
+ }
+
+ snprintf(user_path, sizeof(user_path), "%s/.config", home);
+ return (const GHOST_TUns8 *)user_path;
+ }
+#endif /* WITH_XDG_USER_DIRS */
}
const GHOST_TUns8* GHOST_SystemPathsX11::getBinaryDir() const
Property changes on: branches/bmesh/blender/release
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender/release:31524-41458
+ /trunk/blender/release:31524-41480
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/properties_world.py 2011-11-02 23:16:10 UTC (rev 41481)
@@ -227,7 +227,7 @@
split = layout.split()
col = split.column()
- col.prop(world.mist_settings, "intensity", slider=True)
+ col.prop(world.mist_settings, "intensity")
col.prop(world.mist_settings, "start")
col = split.column()
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_node.py 2011-11-02 23:16:10 UTC (rev 41481)
@@ -27,6 +27,7 @@
def draw(self, context):
layout = self.layout
+ scene = context.scene
snode = context.space_data
snode_id = snode.id
id_from = snode.id_from
@@ -42,12 +43,16 @@
layout.prop(snode, "tree_type", text="", expand=True)
- if snode.tree_type == 'MATERIAL':
- if id_from:
- layout.template_ID(id_from, "active_material", new="material.new")
- if snode_id:
- layout.prop(snode_id, "use_nodes")
+ if snode.tree_type == 'SHADER':
+ if scene.render.use_shading_nodes:
+ layout.prop(snode, "shader_type", text="", expand=True)
+ if not scene.render.use_shading_nodes or snode.shader_type == 'OBJECT':
+ if id_from:
+ layout.template_ID(id_from, "active_material", new="material.new")
+ if snode_id:
+ layout.prop(snode_id, "use_nodes")
+
elif snode.tree_type == 'TEXTURE':
layout.prop(snode, "texture_type", text="", expand=True)
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d.py 2011-11-02 23:16:10 UTC (rev 41481)
@@ -2148,10 +2148,11 @@
subsub.active = scene.unit_settings.system == 'NONE'
subsub.prop(view, "grid_subdivisions", text="Subdivisions")
- col = layout.column()
- col.label(text="Shading:")
- col.prop(gs, "material_mode", text="")
- col.prop(view, "show_textured_solid")
+ if not scene.render.use_shading_nodes:
+ col = layout.column()
+ col.label(text="Shading:")
+ col.prop(gs, "material_mode", text="")
+ col.prop(view, "show_textured_solid")
layout.separator()
Modified: branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py
===================================================================
--- branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-11-02 22:55:15 UTC (rev 41480)
+++ branches/bmesh/blender/release/scripts/startup/bl_ui/space_view3d_toolbar.py 2011-11-02 23:16:10 UTC (rev 41481)
@@ -481,12 +481,9 @@
col.template_ID_preview(settings, "brush", new="brush.add", rows=3, cols=8)
# Particle Mode #
-
- # XXX This needs a check if psys is editable.
if context.particle_edit_object:
tool = settings.tool
- # XXX Select Particle System
layout.column().prop(settings, "tool", expand=True)
if tool != 'NONE':
@@ -825,13 +822,11 @@
if brush.use_anchor:
col.separator()
- row = col.row()
- row.prop(brush, "use_edge_to_edge", "Edge To Edge")
+ col.prop(brush, "use_edge_to_edge", "Edge To Edge")
if brush.use_airbrush:
col.separator()
- row = col.row()
- row.prop(brush, "rate", text="Rate", slider=True)
+ col.prop(brush, "rate", text="Rate", slider=True)
if brush.use_space:
col.separator()
@@ -857,8 +852,7 @@
row.prop(brush, "use_pressure_jitter", toggle=True, text="")
else:
- row = col.row()
- row.prop(brush, "use_airbrush")
+ col.prop(brush, "use_airbrush")
row = col.row()
row.active = brush.use_airbrush and (not brush.use_space) and (not brush.use_anchor)
@@ -867,8 +861,7 @@
col.separator()
if not image_paint:
- row = col.row()
- row.prop(brush, "use_smooth_stroke")
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list