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:
authorCampbell Barton <ideasman42@gmail.com>2010-11-03 04:56:02 +0300
committerCampbell Barton <ideasman42@gmail.com>2010-11-03 04:56:02 +0300
commit6b767b8018cbf5ca5657cad842271d8d6327ddd0 (patch)
tree0ccc6e91534c8cca4016866c387793a4668e3b74 /source/creator
parentb9c3bfa053fb3e86ad00a5f551a96f715e4a6818 (diff)
fix [#24499] Consistency Issue with LassoSelect/ExtendOption
Added extend option to lasso. also... - selecting bones wasn't checking their layer of if they were hidden in a number of places. - fixed memory leak. small unrealed changes - added PBONE_VISIBLE macro - renamed functions used for paint selectoin from *_tface to paintface_*. sine they no longer have anything todo with tface's. - removed scanfill include from BLI_blenlib.h, this is only used in very few places and quite specific. Noticed lasso select is broken for metaballs and face mask mode but this has been the case for a while, will look into it next.
Diffstat (limited to 'source/creator')
-rw-r--r--source/creator/CMakeLists.txt7
-rw-r--r--source/creator/creator.c4
2 files changed, 7 insertions, 4 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index c661f6b2812..e093eb8cb65 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -40,8 +40,6 @@ INCLUDE_DIRECTORIES(
../blender/makesdna
../blender/gpu
../blender/windowmanager
- ../kernel/gen_messaging
- ../kernel/gen_system
)
IF(WIN32)
@@ -78,6 +76,11 @@ IF(WITH_PYTHON)
ENDIF(WITH_PYTHON)
IF(WITH_GAMEENGINE)
+ INCLUDE_DIRECTORIES(
+ ../kernel/gen_messaging
+ ../kernel/gen_system
+ )
+
ADD_DEFINITIONS(-DWITH_GAMEENGINE)
ENDIF(WITH_GAMEENGINE)
diff --git a/source/creator/creator.c b/source/creator/creator.c
index 4a217a147fa..aad70ea9178 100644
--- a/source/creator/creator.c
+++ b/source/creator/creator.c
@@ -57,8 +57,7 @@
#include "BLI_args.h"
#include "BLI_threads.h"
-
-#include "GEN_messaging.h"
+#include "BLI_scanfill.h" // for BLI_setErrorCallBack, TODO, move elsewhere
#include "DNA_ID.h"
#include "DNA_scene_types.h"
@@ -98,6 +97,7 @@
/* for passing information between creator and gameengine */
#ifdef WITH_GAMEENGINE
+#include "GEN_messaging.h"
#include "SYS_System.h"
#else /* dummy */
#define SYS_SystemHandle int