diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-05 02:33:45 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-05 02:33:45 +0400 |
| commit | 724746dba2deed8e336fc66b36bfc3b5b1858a8e (patch) | |
| tree | 3d05fa5d1338aeefa91bb6d48139441896f9aced /source/blender/freestyle | |
| parent | ed0e2fbd9f4edd55e11df694b34e233cb38cb953 (diff) | |
A patch set by Bastien Montagne (many thanks!)
* Removed the ../include and ../src include directories from scons/cmake files.
These directories do not exist and are very noisy when building.
* Coding style clean-up in Python scripts: 'string' is used for enum values,
and "string" for usual stings.
* UILayout.active is used instead of UILayout.enabled to grey out "inactive"
settings. This still allows users to edit them, which can be handy sometimes.
* Improved UI layout of the Line Style panel by means of:
- The standard “column” paradigm is used in more places;
- More compact layout where possible; and
- Tweaks to the modifiers' header.
* Improved UI layout of the Line Set panel by rearranging the "Selection by"
options into a compact row of toggle buttons.
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | source/blender/freestyle/SConscript | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/freestyle/CMakeLists.txt b/source/blender/freestyle/CMakeLists.txt index 0bbccd0fca4..8a006c08b2c 100644 --- a/source/blender/freestyle/CMakeLists.txt +++ b/source/blender/freestyle/CMakeLists.txt @@ -29,7 +29,7 @@ file(GLOB_RECURSE SRC *.cpp *.h) set(INC ../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna ../python ../python/intern - ../render/extern/include ../render/intern/include ../include ../src + ../render/extern/include ../render/intern/include ../../../extern/glew/include ../../../intern/guardedalloc ../freestyle ) diff --git a/source/blender/freestyle/SConscript b/source/blender/freestyle/SConscript index 4ad790f53e5..281accc7629 100644 --- a/source/blender/freestyle/SConscript +++ b/source/blender/freestyle/SConscript @@ -8,7 +8,7 @@ incs = '' incs += '../blenkernel ../blenloader ../blenlib ../imbuf ../makesdna ../makesrna' incs += ' ../python ../python/intern' -incs += ' ../render/extern/include ../render/intern/include ../include ../src' +incs += ' ../render/extern/include ../render/intern/include' incs += ' #/extern/glew/include #/intern/guardedalloc ../freestyle' incs += ' ' + env['BF_PYTHON_INC'] incs += ' ' + env['BF_PNG_INC'] |