9bf630a1f3
do a make clean in source/blender/ to be sure!
- Included the new shaders from Cessen... well, only the shader calls
themselves. To make sure the shaders work I nicely integrated it
- MaterialButtons: layout changed a bit, but still resembles the old
layout. The 'shader' options now are located together.
- Shaders are separated in 'diffuse' and 'specular'. You can combine them
freely.
- diffuse Lambert: old shader
diffuse Oren Nayar: new shader, gives sandy/silky/skinny material well
diffuse Toon: for cartoon render
- specular Phong: new spec, traditional 70ies spec
specular CookTorr: a reduced version of cook torrance shading, does
off specular peak well
specular Blinn: new spec, same features as CookTorr, but with extra
'refraction' setting
specular Toon: new spec for cartoon render
- default blender starts with settings that render compatible!
- works in shaded view and preview-render
- works in unified render
Further little changes:
- removed paranoia compile warnings from render/loader/blenlib
- and the warnings at files I worked at were removed.
61 lines
1.8 KiB
Makefile
61 lines
1.8 KiB
Makefile
#
|
|
# $Id$
|
|
#
|
|
# ***** BEGIN GPL/BL DUAL LICENSE BLOCK *****
|
|
#
|
|
# This program is free software; you can redistribute it and/or
|
|
# modify it under the terms of the GNU General Public License
|
|
# as published by the Free Software Foundation; either version 2
|
|
# of the License, or (at your option) any later version. The Blender
|
|
# Foundation also sells licenses for use in proprietary software under
|
|
# the Blender License. See http://www.blender.org/BL/ for information
|
|
# about this.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program; if not, write to the Free Software Foundation,
|
|
# Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
#
|
|
# The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
|
|
# All rights reserved.
|
|
#
|
|
# The Original Code is: all of this file.
|
|
#
|
|
# Contributor(s): none yet.
|
|
#
|
|
# ***** END GPL/BL DUAL LICENSE BLOCK *****
|
|
#
|
|
#
|
|
|
|
LIBNAME = blenlib
|
|
DIR = $(OCGDIR)/blender/$(LIBNAME)
|
|
|
|
include nan_compile.mk
|
|
|
|
ifeq ($(OS),$(findstring $(OS), "beos darwin freebsd linux openbsd solaris windows"))
|
|
CFLAGS += -funsigned-char
|
|
endif
|
|
|
|
# CPPFLAGS += $(LEVEL_2_C_WARNINGS)
|
|
|
|
# path to SDNA types
|
|
CPPFLAGS += -I../../makesdna
|
|
# path to our own external headerfiles
|
|
CPPFLAGS += -I..
|
|
# path to the guarded memory allocator
|
|
CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include
|
|
# path to freetype font stuff
|
|
CPPFLAGS += -I$(NAN_FREETYPE)/include
|
|
CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2
|
|
# path to blenkernel
|
|
CPPFLAGS += -I$(SRCHOME)/blender/blenkernel
|
|
CPPFLAGS += -I../../include/
|
|
|
|
ifdef WITH_FREETYPE2
|
|
CPPFLAGS += -DWITH_FREETYPE2
|
|
endif
|