[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55525] branches/soc-2008-mxcurioni/source /blender: A major code update for making the DNA file specification of Freestyle settings
IRIE Shinsuke
irieshinsuke at yahoo.co.jp
Sat Mar 23 05:33:41 CET 2013
Hi Tamito-san,
This commit breaks CMake compilation. I got the following error:
CMake Error at build_files/cmake/macros.cmake:174 (add_library):
Cannot find source file:
intern/freestyle.c
Tried extensions .c .C .c++ .cc .cpp .cxx .m .M .mm .h .hh .h++ .hm .hpp
.hxx .in .txx
Call Stack (most recent call first):
build_files/cmake/macros.cmake:189 (blender_add_lib_nolist)
source/blender/blenkernel/CMakeLists.txt:440 (blender_add_lib)
CMake attempts to find nonexistent files intern/freestyle.c and
BKE_freestyle.h.
Regards,
IRIE Shinsuke
Tamito Kajiyama wrote:
> Revision: 55525
> http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55525
> Author: kjym3
> Date: 2013-03-23 03:00:37 +0000 (Sat, 23 Mar 2013)
> Log Message:
> -----------
> A major code update for making the DNA file specification of Freestyle settings
> and RNA for it independent of the build flag for enabling Freestyle. Suggested
> by Sergey Sharybin through a code review of the branch.
>
> * Many #ifdef WITH_FREESTYLE blocks were removed to always have Freestyle-specific
> DNA file specification and RNA for it built in Blender. This will allow Freestyle
> setting survive even when a non-Freestyle build is used for loading and saving
> files. It is noted that operations are still conditionally built through #ifdef
> WITH_FREESTYLE blocks.
>
> * To this end, new blenkernel files BKE_freestyle.h and intern/freestyle.c have
> been added. All API functions in FRS_freestyle_config.h as well as some of those
> in FRS_freestyle.h were moved to the new files. Now the relocated API functions
> have BKE_ prefix instead of FRS_.
>
> Modified Paths:
> --------------
> branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/SConscript
> branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
> branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/blenfont/SConscript
> branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
> branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
> branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/blenkernel/SConscript
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/anim_sys.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/bpath.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/group.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/idcode.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/library.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/material.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/object.c
> branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/scene.c
> branches/soc-2008-mxcurioni/source/blender/blenlib/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/blenlib/SConscript
> branches/soc-2008-mxcurioni/source/blender/blenloader/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/blenloader/SConscript
> branches/soc-2008-mxcurioni/source/blender/blenloader/intern/readfile.c
> branches/soc-2008-mxcurioni/source/blender/blenloader/intern/writefile.c
> branches/soc-2008-mxcurioni/source/blender/editors/animation/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/editors/animation/SConscript
> branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_defines.c
> branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_channels_edit.c
> branches/soc-2008-mxcurioni/source/blender/editors/animation/anim_filter.c
> branches/soc-2008-mxcurioni/source/blender/editors/include/ED_anim_api.h
> branches/soc-2008-mxcurioni/source/blender/editors/include/UI_resources.h
> branches/soc-2008-mxcurioni/source/blender/editors/interface/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/editors/interface/SConscript
> branches/soc-2008-mxcurioni/source/blender/editors/interface/interface_templates.c
> branches/soc-2008-mxcurioni/source/blender/editors/interface/resources.c
> branches/soc-2008-mxcurioni/source/blender/editors/render/render_shading.c
> branches/soc-2008-mxcurioni/source/blender/editors/space_nla/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/editors/space_nla/SConscript
> branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_buttons.c
> branches/soc-2008-mxcurioni/source/blender/editors/space_nla/nla_channels.c
> branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle.h
> branches/soc-2008-mxcurioni/source/blender/freestyle/intern/blender_interface/FRS_freestyle.cpp
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_ID.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_action_types.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_material_types.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_mesh_types.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_meshdata_types.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_scene_types.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_userdef_types.h
> branches/soc-2008-mxcurioni/source/blender/makesdna/intern/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/makesdna/intern/SConscript
> branches/soc-2008-mxcurioni/source/blender/makesdna/intern/makesdna.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_access.h
> branches/soc-2008-mxcurioni/source/blender/makesrna/RNA_enum_types.h
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/CMakeLists.txt
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/SConscript
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/makesrna.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_ID.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_action.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_color.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_internal.h
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_main_api.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_mesh.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_scene.c
> branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_userdef.c
> branches/soc-2008-mxcurioni/source/blender/render/intern/source/render_result.c
> branches/soc-2008-mxcurioni/source/blender/windowmanager/WM_types.h
>
> Removed Paths:
> -------------
> branches/soc-2008-mxcurioni/source/blender/freestyle/FRS_freestyle_config.h
>
> Modified: branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/CMakeLists.txt 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -43,6 +43,7 @@
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_dynamicpaint_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_effect_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_fileglobal_types.h
> + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_freestyle_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_genfile.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_gpencil_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_group_types.h
> @@ -51,6 +52,7 @@
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_key_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lamp_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_lattice_types.h
> + ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_listBase.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_material_types.h
> ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_mesh_types.h
> @@ -140,9 +142,6 @@
> endif()
>
> if(WITH_FREESTYLE)
> - list(APPEND SRC_DNA_INC
> - ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_linestyle_types.h
> - )
> add_subdirectory(freestyle)
> endif()
>
>
> Modified: branches/soc-2008-mxcurioni/source/blender/SConscript
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/SConscript 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/SConscript 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -66,5 +66,6 @@
>
> if env['WITH_BF_COMPOSITOR']:
> SConscript (['compositor/SConscript'])
> +
> if env['WITH_BF_FREESTYLE']:
> SConscript (['freestyle/SConscript'])
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/blenfont/BLF_translation.h 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -134,9 +134,7 @@
> #define BLF_I18NCONTEXT_ID_BRUSH "Brush"
> #define BLF_I18NCONTEXT_ID_CAMERA "Camera"
> #define BLF_I18NCONTEXT_ID_CURVE "Curve"
> -#ifdef WITH_FREESTYLE
> -# define BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE "FreestyleLineStyle"
> -#endif
> +#define BLF_I18NCONTEXT_ID_FREESTYLELINESTYLE "FreestyleLineStyle"
> #define BLF_I18NCONTEXT_ID_GPENCIL "GPencil"
> #define BLF_I18NCONTEXT_ID_GROUP "Group"
> #define BLF_I18NCONTEXT_ID_ID "ID"
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/blenfont/CMakeLists.txt 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -59,10 +59,6 @@
> add_definitions(-DWITH_INTERNATIONAL)
> endif()
>
> -if(WITH_FREESTYLE)
> - add_definitions(-DWITH_FREESTYLE)
> -endif()
> -
> add_definitions(-DGLEW_STATIC)
>
> blender_add_lib(bf_blenfont "${SRC}" "${INC}" "${INC_SYS}")
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenfont/SConscript
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenfont/SConscript 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/blenfont/SConscript 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -43,7 +43,4 @@
> if env['WITH_BF_INTERNATIONAL']:
> defs.append('WITH_INTERNATIONAL')
>
> -if env['WITH_BF_FREESTYLE']:
> - defs.append('WITH_FREESTYLE')
> -
> env.BlenderLib ( 'bf_blenfont', sources, Split(incs), defines=defs, libtype=['core','player'], priority=[210,210] )
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -33,8 +33,6 @@
> * \brief Blender kernel freestyle line style functionality.
> */
>
> -#ifdef WITH_FREESTYLE
> -
> #include "DNA_linestyle_types.h"
>
> #define LS_MODIFIER_TYPE_COLOR 1
> @@ -44,36 +42,35 @@
>
> struct Main;
> struct Object;
> +struct ColorBand;
>
> -FreestyleLineStyle *FRS_new_linestyle(const char *name, struct Main *main);
> -void FRS_free_linestyle(FreestyleLineStyle *linestyle);
> -FreestyleLineStyle *FRS_copy_linestyle(FreestyleLineStyle *linestyle);
> +FreestyleLineStyle *BKE_new_linestyle(const char *name, struct Main *main);
> +void BKE_free_linestyle(FreestyleLineStyle *linestyle);
> +FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle *linestyle);
>
> -LineStyleModifier *FRS_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type);
> -LineStyleModifier *FRS_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type);
> -LineStyleModifier *FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type);
> -LineStyleModifier *FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type);
> +LineStyleModifier *BKE_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type);
> +LineStyleModifier *BKE_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type);
> +LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type);
> +LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type);
>
> -LineStyleModifier *FRS_copy_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> -LineStyleModifier *FRS_copy_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> -LineStyleModifier *FRS_copy_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> -LineStyleModifier *FRS_copy_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> +LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> +LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> +LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
> +LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m);
>
> -void FRS_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> -void FRS_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> -void FRS_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> -void FRS_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> +void BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> +void BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> +void BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
> +void BKE_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier);
>
> -void FRS_move_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> -void FRS_move_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> -void FRS_move_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> -void FRS_move_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> +void BKE_move_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> +void BKE_move_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> +void BKE_move_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
> +void BKE_move_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction);
>
> -void FRS_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase);
> -char *FRS_path_from_ID_to_color_ramp(FreestyleLineStyle *linestyle, ColorBand *color_ramp);
> +void BKE_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase *listbase);
> +char *BKE_path_from_ID_to_color_ramp(FreestyleLineStyle *linestyle, struct ColorBand *color_ramp);
>
> -void FRS_unlink_linestyle_target_object(FreestyleLineStyle *linestyle, struct Object *ob);
> +void BKE_unlink_linestyle_target_object(FreestyleLineStyle *linestyle, struct Object *ob);
>
> -#endif /* WITH_FREESTYLE */
> -
> #endif /* __BKE_LINESTYLE_H__ */
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_main.h 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -88,9 +88,7 @@
> ListBase gpencil;
> ListBase movieclip;
> ListBase mask;
> -#ifdef WITH_FREESTYLE
> ListBase linestyle;
> -#endif
>
> char id_tag_update[256];
> } Main;
>
> Modified: branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt
> ===================================================================
> --- branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt 2013-03-23 01:05:46 UTC (rev 55524)
> +++ branches/soc-2008-mxcurioni/source/blender/blenkernel/CMakeLists.txt 2013-03-23 03:00:37 UTC (rev 55525)
> @@ -90,6 +90,7 @@
> intern/fluidsim.c
> intern/fmodifier.c
> intern/font.c
> + intern/freestyle.c
> intern/gpencil.c
> intern/group.c
> intern/icons.c
> @@ -103,6 +104,7 @@
> intern/lamp.c
> intern/lattice.c
> intern/library.c
> + intern/linestyle.c
> intern/mask.c
> intern/mask_evaluate.c
> intern/mask_rasterize.c
> @@ -188,6 +190,7 @@
> BKE_fcurve.h
> BKE_fluidsim.h
> BKE_font.h
> + BKE_freestyle.h
> BKE_global.h
> BKE_gpencil.h
> BKE_group.h
> @@ -200,6 +203,7 @@
>
> @@ Diff output truncated at 10240 characters. @@
> _______________________________________________
> Bf-blender-cvs mailing list
> Bf-blender-cvs at blender.org
> http://lists.blender.org/mailman/listinfo/bf-blender-cvs
>
More information about the Bf-blender-cvs
mailing list