← Back to branch summary

~ubuntu-branches/ubuntu/utopic/blender/utopic-proposed

« back to all changes in this revision

Viewing changes to source/blender/makesrna/intern/rna_dynamicpaint.c

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
source/blender/makesrna/intern/rna_dynamicpaint.c
39
39
#include "DNA_scene_types.h"
40
40
 
41
41
#include "RNA_define.h"
 
42
#include "RNA_enum_types.h"
42
43
 
43
44
#include "rna_internal.h"
44
45
 
95
96
 *      Surfaces
96
97
 */
97
98
 
98
 
static void rna_DynamicPaint_redoModifier(Main *bmain, Scene *scene, PointerRNA *ptr)
 
99
static void rna_DynamicPaint_redoModifier(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
99
100
{
100
101
        DAG_id_tag_update(ptr->id.data, OB_RECALC_DATA);
101
102
}
102
103
 
103
 
static void rna_DynamicPaintSurfaces_updateFrames(Main *bmain, Scene *scene, PointerRNA *ptr)
 
104
static void rna_DynamicPaintSurfaces_updateFrames(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
104
105
{
105
106
        dynamicPaint_cacheUpdateFrames((DynamicPaintSurface *)ptr->data);
106
107
}
134
135
        rna_DynamicPaint_redoModifier(bmain, scene, ptr);
135
136
}
136
137
 
137
 
static void rna_DynamicPaintSurface_uniqueName(Main *bmain, Scene *scene, PointerRNA *ptr)
 
138
static void rna_DynamicPaintSurface_uniqueName(Main *UNUSED(bmain), Scene *UNUSED(scene), PointerRNA *ptr)
138
139
{
139
140
        dynamicPaintSurface_setUniqueName((DynamicPaintSurface *)ptr->data, ((DynamicPaintSurface *)ptr->data)->name);
140
141
}
196
197
        return;
197
198
}
198
199
 
199
 
static void rna_Surface_active_point_range(PointerRNA *ptr, int *min, int *max, int *softmin, int *softmax)
 
200
static void rna_Surface_active_point_range(PointerRNA *ptr, int *min, int *max,
 
201
                                           int *UNUSED(softmin), int *UNUSED(softmax))
200
202
{
201
203
        DynamicPaintCanvasSettings *canvas = (DynamicPaintCanvasSettings *)ptr->data;
202
204
 
243
245
}
244
246
 
245
247
 
246
 
static EnumPropertyItem *rna_DynamicPaint_surface_type_itemf(bContext *C, PointerRNA *ptr,
247
 
                                                             PropertyRNA *UNUSED(prop), int *free)
 
248
static EnumPropertyItem *rna_DynamicPaint_surface_type_itemf(
 
249
        bContext *UNUSED(C), PointerRNA *ptr, PropertyRNA *UNUSED(prop), int *free)
248
250
{
249
251
        DynamicPaintSurface *surface = (DynamicPaintSurface *)ptr->data;
250
252
 
710
712
        RNA_def_property_ui_range(prop, 0.01, 1.0, 1, 2);
711
713
        RNA_def_property_ui_text(prop, "Spring", "Spring force that pulls water level back to zero");
712
714
 
 
715
        prop = RNA_def_property(srna, "wave_smoothness", PROP_FLOAT, PROP_NONE);
 
716
        RNA_def_property_range(prop, 0.0, 10.0);
 
717
        RNA_def_property_ui_range(prop, 0.1, 5.0, 1, 2);
 
718
        RNA_def_property_ui_text(prop, "Smoothness", "Limit maximum steepness of wave slope between simulation points "
 
719
                                                     "(use higher values for smoother waves at expense of reduced detail)");
 
720
 
713
721
        prop = RNA_def_property(srna, "use_wave_open_border", PROP_BOOLEAN, PROP_NONE);
714
722
        RNA_def_property_boolean_sdna(prop, NULL, "flags", MOD_DPAINT_WAVE_OPEN_BORDERS);
715
723
        RNA_def_property_ui_text(prop, "Open Borders", "Pass waves through mesh edges");