Dynamic Paint:
authorMiika Hamalainen <blender@miikah.org>
Thu, 16 Jun 2011 18:25:41 +0000 (18:25 +0000)
committerMiika Hamalainen <blender@miikah.org>
Thu, 16 Jun 2011 18:25:41 +0000 (18:25 +0000)
* Fixed cmake compile.
* Fixed segmentation fault when closing Blender, caused by rna changes from earlier svn trunk merge.

source/blender/CMakeLists.txt
source/blender/blenkernel/BKE_pointcache.h
source/blender/makesrna/intern/CMakeLists.txt
source/blender/makesrna/intern/rna_dynamicpaint.c

index a073f5083e51e4d83f21c1e81ce491ebe7635f0c..30ebe4912c3f0624cc62ab2a115e98ba10145def 100644 (file)
@@ -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
index d7601b232c6dc8f363c7ea2c24993309f170bf22..b7f60af38a6eec53563dc3f93eef03edd081bcf3 100644 (file)
@@ -92,7 +92,6 @@ struct PointCache;
 struct Scene;
 struct SmokeModifierData;
 struct SoftBody;
-struct DynamicPaintModifierData;
 
 /* temp structure for read/write */
 typedef struct PTCacheData {
index 4e4ff396e71e0e0ce3bf8085a90f3f8fe78f7d96..6b85becb67e694df4011bbe91023ec50afc1934d 100644 (file)
@@ -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
index a1e5352ce87ccefe09ccb1d8ff86b7951ce1d844..7dccce8571ef158073ae1bf8b4569226f29fa7e1 100644 (file)
@@ -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