diff options
| author | Maxime Curioni <maxime.curioni@gmail.com> | 2009-10-07 09:16:23 +0400 |
|---|---|---|
| committer | Maxime Curioni <maxime.curioni@gmail.com> | 2009-10-07 09:16:23 +0400 |
| commit | bae853a8a011cc2a6f339e55fd6f09a0cf61db90 (patch) | |
| tree | e3e7e458303ccd7d59012ed1bce37ca8dd6571ce /source/blender/freestyle | |
| parent | 043233943c4d48d2d59bcef18a31c47dfc9031df (diff) | |
committed Tamito Kajiyama's RNA and GUI patch for Freestyle integration into Blender 2.5. As of I right now, Freestyle is back in the UI, but rendering still fails because of the texture manager.
Diffstat (limited to 'source/blender/freestyle')
| -rw-r--r-- | source/blender/freestyle/FRS_freestyle.h | 3 | ||||
| -rw-r--r-- | source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/source/blender/freestyle/FRS_freestyle.h b/source/blender/freestyle/FRS_freestyle.h index 9d20c2c4763..96696b9cc1f 100644 --- a/source/blender/freestyle/FRS_freestyle.h +++ b/source/blender/freestyle/FRS_freestyle.h @@ -1,9 +1,6 @@ #ifndef FRS_FREESTYLE_H #define FRS_FREESTYLE_H -#define FREESTYLE_SUGGESTIVE_CONTOURS_FLAG 1 -#define FREESTYLE_RIDGES_AND_VALLEYS_FLAG 2 - #ifdef __cplusplus extern "C" { #endif diff --git a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp index 74c9e377a15..6346c05b0d6 100644 --- a/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp +++ b/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp @@ -295,22 +295,22 @@ extern "C" { void FRS_delete_module(void *module_index_ptr, void *unused) { - FreestyleModuleConfig* module_conf = (FreestyleModuleConfig*) BLI_findlink(freestyle_modules, (intptr_t)module_index_ptr); + FreestyleModuleConfig* module_conf = (FreestyleModuleConfig*) module_index_ptr; BLI_freelinkN( freestyle_modules, module_conf); } void FRS_move_up_module(void *module_index_ptr, void *unused) { - FreestyleModuleConfig* module_conf = (FreestyleModuleConfig*) BLI_findlink(freestyle_modules, (intptr_t)module_index_ptr); - + FreestyleModuleConfig* module_conf = (FreestyleModuleConfig*) module_index_ptr; + BLI_remlink(freestyle_modules, module_conf); BLI_insertlink(freestyle_modules, module_conf->prev->prev, module_conf); } void FRS_move_down_module(void *module_index_ptr, void *unused) { - FreestyleModuleConfig* module_conf = (FreestyleModuleConfig*) BLI_findlink(freestyle_modules, (intptr_t)module_index_ptr); + FreestyleModuleConfig* module_conf = (FreestyleModuleConfig*) module_index_ptr; BLI_remlink(freestyle_modules, module_conf); BLI_insertlink(freestyle_modules, module_conf->next, module_conf); |