[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37564] branches/soc-2011-carrot/source/ blender: Dynamic Paint:

Miika Hämäläinen miika.hamalainen at kolumbus.fi
Thu Jun 16 20:25:41 CEST 2011


Revision: 37564
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37564
Author:   miikah
Date:     2011-06-16 18:25:41 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
Dynamic Paint:
* Fixed cmake compile.
* Fixed segmentation fault when closing Blender, caused by rna changes from earlier svn trunk merge.

Modified Paths:
--------------
    branches/soc-2011-carrot/source/blender/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/blenkernel/BKE_pointcache.h
    branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
    branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c

Modified: branches/soc-2011-carrot/source/blender/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/source/blender/CMakeLists.txt	2011-06-16 18:02:14 UTC (rev 37563)
+++ branches/soc-2011-carrot/source/blender/CMakeLists.txt	2011-06-16 18:25:41 UTC (rev 37564)
@@ -40,6 +40,7 @@
 	${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

Modified: branches/soc-2011-carrot/source/blender/blenkernel/BKE_pointcache.h
===================================================================
--- branches/soc-2011-carrot/source/blender/blenkernel/BKE_pointcache.h	2011-06-16 18:02:14 UTC (rev 37563)
+++ branches/soc-2011-carrot/source/blender/blenkernel/BKE_pointcache.h	2011-06-16 18:25:41 UTC (rev 37564)
@@ -92,7 +92,6 @@
 struct Scene;
 struct SmokeModifierData;
 struct SoftBody;
-struct DynamicPaintModifierData;
 
 /* temp structure for read/write */
 typedef struct PTCacheData {

Modified: branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt	2011-06-16 18:02:14 UTC (rev 37563)
+++ branches/soc-2011-carrot/source/blender/makesrna/intern/CMakeLists.txt	2011-06-16 18:25:41 UTC (rev 37564)
@@ -47,6 +47,7 @@
 	rna_context.c
 	rna_controller.c
 	rna_curve.c
+	rna_dynamicpaint.c
 	rna_fcurve.c
 	rna_fluidsim.c
 	rna_gpencil.c

Modified: branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c
===================================================================
--- branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c	2011-06-16 18:02:14 UTC (rev 37563)
+++ branches/soc-2011-carrot/source/blender/makesrna/intern/rna_dynamicpaint.c	2011-06-16 18:25:41 UTC (rev 37564)
@@ -181,7 +181,7 @@
 }
 
 
-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 @@
 	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 @@
 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




More information about the Bf-blender-cvs mailing list