diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-16 22:25:41 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-16 22:25:41 +0400 |
| commit | 2987b68b0f3b3bac30653fb40c35b754a790c110 (patch) | |
| tree | 725a4490da819d27a1d27c408c017579ca57d4b7 | |
| parent | b937a4f5b6adc6bc0dca62cb5c87db08c873cfba (diff) | |
Dynamic Paint:
* Fixed cmake compile.
* Fixed segmentation fault when closing Blender, caused by rna changes from earlier svn trunk merge.
| -rw-r--r-- | source/blender/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/blenkernel/BKE_pointcache.h | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_dynamicpaint.c | 6 |
4 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/CMakeLists.txt b/source/blender/CMakeLists.txt index a073f5083e5..30ebe4912c3 100644 --- a/source/blender/CMakeLists.txt +++ b/source/blender/CMakeLists.txt @@ -40,6 +40,7 @@ set(SRC_DNA_INC ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_curve_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_customdata_types.h ${CMAKE_CURRENT_SOURCE_DIR}/makesdna/DNA_documentation.h + ${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_genfile.h diff --git a/source/blender/blenkernel/BKE_pointcache.h b/source/blender/blenkernel/BKE_pointcache.h index d7601b232c6..b7f60af38a6 100644 --- a/source/blender/blenkernel/BKE_pointcache.h +++ b/source/blender/blenkernel/BKE_pointcache.h @@ -92,7 +92,6 @@ struct PointCache; struct Scene; struct SmokeModifierData; struct SoftBody; -struct DynamicPaintModifierData; /* temp structure for read/write */ typedef struct PTCacheData { diff --git a/source/blender/makesrna/intern/CMakeLists.txt b/source/blender/makesrna/intern/CMakeLists.txt index 4e4ff396e71..6b85becb67e 100644 --- a/source/blender/makesrna/intern/CMakeLists.txt +++ b/source/blender/makesrna/intern/CMakeLists.txt @@ -47,6 +47,7 @@ set(DEFSRC rna_context.c rna_controller.c rna_curve.c + rna_dynamicpaint.c rna_fcurve.c rna_fluidsim.c rna_gpencil.c diff --git a/source/blender/makesrna/intern/rna_dynamicpaint.c b/source/blender/makesrna/intern/rna_dynamicpaint.c index a1e5352ce87..7dccce8571e 100644 --- a/source/blender/makesrna/intern/rna_dynamicpaint.c +++ b/source/blender/makesrna/intern/rna_dynamicpaint.c @@ -181,7 +181,7 @@ static void rna_DynamicPaint_uses_cache_set(PointerRNA *ptr, int value) } -static EnumPropertyItem *rna_DynamicPaint_surface_type_itemf(bContext *C, PointerRNA *ptr, int *free) +static EnumPropertyItem *rna_DynamicPaint_surface_type_itemf(bContext *C, PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free) { DynamicPaintSurface *surface= (DynamicPaintSurface*)ptr->data; @@ -514,7 +514,7 @@ static void rna_def_dynamic_paint_canvas_settings(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Bake Info", "Info on bake status"); } -static void rna_def_dynamic_paint_painter_settings(BlenderRNA *brna) +static void rna_def_dynamic_paint_brush_settings(BlenderRNA *brna) { StructRNA *srna; PropertyRNA *prop; @@ -667,7 +667,7 @@ static void rna_def_dynamic_paint_painter_settings(BlenderRNA *brna) void RNA_def_dynamic_paint(BlenderRNA *brna) { rna_def_dynamic_paint_canvas_settings(brna); - rna_def_dynamic_paint_painter_settings(brna); + rna_def_dynamic_paint_brush_settings(brna); } #endif |