Revision: 39664
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39664
Author: campbellbarton
Date: 2011-08-24 01:44:54 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
svn merge -r39433:39493 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39433
Modified Paths:
--------------
branches/bmesh/blender/GNUmakefile
branches/bmesh/blender/build_files/cmake/config/blender_headless.cmake
branches/bmesh/blender/build_files/cmake/config/blender_lite.cmake
branches/bmesh/blender/build_files/cmake/config/bpy_module.cmake
branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
branches/bmesh/blender/release/scripts/startup/bl_ui/space_image.py
branches/bmesh/blender/source/blender/blenkernel/intern/displist.c
branches/bmesh/blender/source/blender/editors/interface/interface_regions.c
branches/bmesh/blender/source/blender/editors/space_node/node_edit.c
branches/bmesh/blender/source/blender/editors/space_view3d/drawobject.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_header.c
branches/bmesh/blender/source/blender/editors/space_view3d/view3d_select.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_object_force.c
branches/bmesh/blender/source/blender/makesrna/intern/rna_smoke.c
branches/bmesh/blender/source/blender/python/mathutils/mathutils_Vector.c
Added Paths:
-----------
branches/bmesh/blender/build_files/cmake/config/
Property Changed:
----------------
branches/bmesh/blender/
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_metaball.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_modifier.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_game.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_material.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_particle.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_field.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_fluid.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_physics_smoke.py
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_texture.py
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/source/blender/editors/render/render_update.c
branches/bmesh/blender/source/blender/editors/space_outliner/
branches/bmesh/blender/source/blender/editors/uvedit/uvedit_buttons.c
Property changes on: branches/bmesh/blender
___________________________________________________________________
Modified: svn:mergeinfo
- /trunk/blender:31524-39433
+ /trunk/blender:31524-39493
Modified: branches/bmesh/blender/GNUmakefile
===================================================================
--- branches/bmesh/blender/GNUmakefile 2011-08-24 00:44:58 UTC (rev 39663)
+++ branches/bmesh/blender/GNUmakefile 2011-08-24 01:44:54 UTC (rev 39664)
@@ -35,17 +35,33 @@
# Source and Build DIR's
BLENDER_DIR:=$(shell pwd -P)
BUILD_DIR:=$(shell dirname $(BLENDER_DIR))/build/$(OS_NCASE)
+BUILD_TYPE:=Release
+BUILD_CMAKE_ARGS:=""
+# -----------------------------------------------------------------------------
+# additional targets for the build configuration
+
# support 'make debug'
ifneq "$(findstring debug, $(MAKECMDGOALS))" ""
BUILD_DIR:=$(BUILD_DIR)_debug
BUILD_TYPE:=Debug
-else
- BUILD_TYPE:=Release
endif
+ifneq "$(findstring lite, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_lite
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS)
-C$(BLENDER_DIR)/build_files/cmake/config/blender_lite.cmake
+endif
+ifneq "$(findstring headless, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_bpy
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS)
-C$(BLENDER_DIR)/build_files/cmake/config/blender_headless.cmake
+endif
+ifneq "$(findstring bpy, $(MAKECMDGOALS))" ""
+ BUILD_DIR:=$(BUILD_DIR)_bpy
+ BUILD_CMAKE_ARGS:=$(BUILD_CMAKE_ARGS)
-C$(BLENDER_DIR)/build_files/cmake/config/bpy_module.cmake
+endif
+# -----------------------------------------------------------------------------
# Get the number of cores for threaded build
NPROCS:=1
ifeq ($(OS), Linux)
@@ -61,14 +77,14 @@
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
endif
-
+# -----------------------------------------------------------------------------
# Build Blender
all:
@echo
@echo Configuring Blender ...
if test ! -f $(BUILD_DIR)/CMakeCache.txt ; then \
- cmake -H$(BLENDER_DIR) -B$(BUILD_DIR)
-DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE) ; \
+ cmake $(BUILD_CMAKE_ARGS) -H$(BLENDER_DIR) -B$(BUILD_DIR)
-DCMAKE_BUILD_TYPE:STRING=$(BUILD_TYPE); \
fi
@echo
@@ -80,9 +96,40 @@
@echo
debug: all
- # pass
+lite: all
+headless: all
+bpy: all
-# package types
+# -----------------------------------------------------------------------------
+# Helo for build targets
+help:
+ @echo ""
+ @echo "Convenience targets provided for building blender, (multiple at
once can be used)"
+ @echo " * debug - build a debug binary"
+ @echo " * lite - disable non essential features for a smaller
binary and faster build"
+ @echo " * headless - build without an interface (renderfarm or server
automation)"
+ @echo " * bpy - build as a python module which can be loaded
from python directly"
+ @echo ""
+ @echo "Project Files for IDE's"
+ @echo " * project_qtcreator - QtCreator Project Files"
+ @echo " * project_netbeans - NetBeans Project Files"
+ @echo " * project_eclipse - Eclipse CDT4 Project Files"
+ @echo ""
+ @echo "Package Targets"
+ @echo " * package_debian - build a debian package"
+ @echo " * package_pacman - build an arch linux pacmanpackage"
+ @echo " * package_archive - build an archive package"
+ @echo ""
+ @echo "Testing Targets (not assosiated with building blender)"
+ @echo " * test - run ctest, currently tests import/export,
operator execution and that python modules load"
+ @echo " * test_cmake - runs our own cmake file checker which
detects errors in the cmake file list definitions"
+ @echo " * test_pep8 - checks all python script are pep8 which
are tagged to use the stricter formatting"
+ @echo " * test_deprecated - checks for deprecation tags in our code
which may need to be removed"
+ @echo ""
+
+# -----------------------------------------------------------------------------
+# Packages
+#
package_debian:
cd build_files/package_spec ; DEB_BUILD_OPTIONS="parallel=$(NPROCS)" sh
./build_debian.sh
@@ -93,7 +140,10 @@
make -C $(BUILD_DIR) -s package_archive
@echo archive in "$(BUILD_DIR)/release"
-# forward build targets
+
+# -----------------------------------------------------------------------------
+# Tests
+#
test:
cd $(BUILD_DIR) ; ctest . --output-on-failure
@@ -111,6 +161,21 @@
test_deprecated:
python3 source/tests/check_deprecated.py
+
+# -----------------------------------------------------------------------------
+# Project Files
+#
+
+project_qtcreator:
+ python3 build_files/cmake/cmake_qtcreator_project.py $(BUILD_DIR)
+
+project_netbeans:
+ python3 build_files/cmake/cmake_netbeans_project.py $(BUILD_DIR)
+
+project_eclipse:
+ cmake -G"Eclipse CDT4 - Unix Makefiles" -H$(BLENDER_DIR) -B$(BUILD_DIR)
+
+
clean:
$(MAKE) -C $(BUILD_DIR) clean
Modified: branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
===================================================================
--- branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
2011-08-24 00:44:58 UTC (rev 39663)
+++ branches/bmesh/blender/intern/ghost/intern/GHOST_SystemSDL.cpp
2011-08-24 01:44:54 UTC (rev 39664)
@@ -385,8 +385,26 @@
GHOST_TKey gkey=
convertSDLKey(sdl_sub_evt.keysym.scancode);
/* note, the sdl_sub_evt.keysym.sym is truncated, for
unicode support ghost has to be modified */
+ /* printf("%d\n", sym); */
if(sym > 127) {
- sym= 0;
+ switch(sym) {
+ case SDLK_KP_DIVIDE: sym= '/'; break;
+ case SDLK_KP_MULTIPLY: sym= '*'; break;
+ case SDLK_KP_MINUS: sym= '-'; break;
+ case SDLK_KP_PLUS: sym= '+'; break;
+ case SDLK_KP_1: sym= '1'; break;
+ case SDLK_KP_2: sym= '2'; break;
+ case SDLK_KP_3: sym= '3'; break;
+ case SDLK_KP_4: sym= '4'; break;
+ case SDLK_KP_5: sym= '5'; break;
+ case SDLK_KP_6: sym= '6'; break;
+ case SDLK_KP_7: sym= '7'; break;
+ case SDLK_KP_8: sym= '8'; break;
+ case SDLK_KP_9: sym= '9'; break;
+ case SDLK_KP_0: sym= '0'; break;
+ case SDLK_KP_PERIOD: sym= '.'; break;
+ default: sym= 0; break;
+ }
}
else {
if(sdl_sub_evt.keysym.mod &
(KMOD_LSHIFT|KMOD_RSHIFT)) {
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/add_mesh_torus.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_operators/add_mesh_torus.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_operators/uvcalc_smart_project.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_operators/vertexpaint_dirt.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_armature.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_armature.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_bone.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_bone.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_camera.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_camera.py:36154-39493
Modified:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
===================================================================
---
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
2011-08-24 00:44:58 UTC (rev 39663)
+++
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_curve.py
2011-08-24 01:44:54 UTC (rev 39664)
@@ -109,7 +109,7 @@
if (is_curve or is_text):
col.label(text="Fill:")
sub = col.column()
- sub.active = (curve.bevel_object is None)
+ sub.active = (curve.dimensions == '2D' or (curve.bevel_object is
None and curve.dimensions == '3D'))
sub.prop(curve, "use_fill_front")
sub.prop(curve, "use_fill_back")
col.prop(curve, "use_fill_deform", text="Fill Deformed")
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_empty.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_empty.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lamp.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lamp.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_lattice.py
___________________________________________________________________
Modified: svn:mergeinfo
-
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39433
+
/trunk/blender/release/scripts/startup/bl_ui/properties_data_lattice.py:36154-39493
Property changes on:
branches/bmesh/blender/release/scripts/startup/bl_ui/properties_data_mesh.py
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
