Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Ewering <blender@instinctive.de>2005-10-28 23:54:16 +0400
committerAlexander Ewering <blender@instinctive.de>2005-10-28 23:54:16 +0400
commitd3dd5c5b7aa185265ce7816dab996e8fa9288bc6 (patch)
tree77401e6f1e065a054ead43700bb70ae57b7889a3 /source/Makefile
parentb8d81d093a1de39fd21df94bd7b4a4fd81d2491a (diff)
Somehow, most files are missing from this commit, and I have no idea why,
so there will be more files following. Anyway: NEW BOOLEANS from Google Summer of Code (Courtesy of Marc Freixas) Known problems: - Random freezes while using them as a modifier. This may not be directly related to modifiers though - it's maybe just the huge number of operations that leads to a higher probability of triggering a bug - Static booleans (the first 3 entries in the WKEY menu) are borked anyway, this is not due to this commit. - Errors when exiting Blender (dupli_alloc stuff), is not related to this commit, either. Please test if everything works, and check the other build systems, I only know that make works. Also, compare the results of, say, cube-cylinder, in old and new booleans :)
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile
index 078eb867abe..732d7fd97f6 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -79,6 +79,7 @@ PYPLAYERLIB ?= $(PYLIB)
GRPLIB = $(OCGDIR)/creator/$(DEBUG_DIR)libcreator.a
GRPLIB += $(OCGDIR)/blender/src/$(DEBUG_DIR)libsrcpublisher.a
GRPLIB += $(NAN_BSP)/lib/$(DEBUG_DIR)libbsp.a
+ GRPLIB += $(NAN_BOOLOP)/lib/$(DEBUG_DIR)libboolop.a
GRPLIB += $(NAN_SOUNDSYSTEM)/lib/$(DEBUG_DIR)libSoundSystem.a
GRPLIB += $(NAN_GHOST)/lib/$(DEBUG_DIR)libghost.a
GRPLIB += $(NAN_STRING)/lib/$(DEBUG_DIR)libstring.a