Revision: 42053
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42053
Author: campbellbarton
Date: 2011-11-22 10:04:28 +0000 (Tue, 22 Nov 2011)
Log Message:
-----------
- use cache_ as a prefix for new modifiers.
- some comments to recent image changes.
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
trunk/blender/source/blender/editors/space_image/image_buttons.c
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_scene.c
trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
Modified: trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-22 07:40:01 UTC (rev 42052)
+++ trunk/blender/source/blender/blenkernel/intern/dynamicpaint.c
2011-11-22 10:04:28 UTC (rev 42053)
@@ -976,7 +976,7 @@
surface->wave_timescale = 1.0f;
surface->wave_spring = 0.20f;
- modifier_path_init(surface->image_output_path,
sizeof(surface->image_output_path), "dynamicpaint");
+ modifier_path_init(surface->image_output_path,
sizeof(surface->image_output_path), "cache_dynamicpaint");
dynamicPaintSurface_setUniqueName(surface, "Surface");
Modified: trunk/blender/source/blender/editors/space_image/image_buttons.c
===================================================================
--- trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-11-22 07:40:01 UTC (rev 42052)
+++ trunk/blender/source/blender/editors/space_image/image_buttons.c
2011-11-22 10:04:28 UTC (rev 42053)
@@ -855,16 +855,16 @@
uiItemR(col, imfptr, "compression", 0, NULL, ICON_NONE);
}
+ if (ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
+ uiItemR(col, imfptr, "exr_codec", 0, NULL, ICON_NONE);
+ }
+
if (BKE_imtype_supports_zbuf(imf->imtype)) {
uiItemR(col, imfptr, "use_zbuffer", 0, NULL, ICON_NONE);
}
- if (ELEM(imf->imtype, R_IMF_IMTYPE_OPENEXR, R_IMF_IMTYPE_MULTILAYER)) {
- uiItemR(col, imfptr, "exr_codec", 0, NULL, ICON_NONE);
-
- if (is_render_out && (imf->imtype == R_IMF_IMTYPE_OPENEXR)) {
- uiItemR(col, imfptr, "use_preview", 0, NULL, ICON_NONE);
- }
+ if (is_render_out && (imf->imtype == R_IMF_IMTYPE_OPENEXR)) {
+ uiItemR(col, imfptr, "use_preview", 0, NULL, ICON_NONE);
}
if (imf->imtype == R_IMF_IMTYPE_JP2) {
Modified: trunk/blender/source/blender/makesdna/DNA_scene_types.h
===================================================================
--- trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-11-22
07:40:01 UTC (rev 42052)
+++ trunk/blender/source/blender/makesdna/DNA_scene_types.h 2011-11-22
10:04:28 UTC (rev 42053)
@@ -209,8 +209,13 @@
/* note, srl->passflag is treestore element 'nr' in outliner, short still... */
-/* generic image format settings,
- * no video codec info however */
+/* Generic image format settings,
+ * this is used for NodeImageFile and IMAGE_OT_save_as operator too.
+ *
+ * note: its a bit strange that even though this is an image format struct
+ * the imtype can still be used to select video formats.
+ * RNA ensures these enum's are only selectable for render output.
+ */
typedef struct ImageFormatData {
char imtype; /* R_IMF_IMTYPE_PNG, R_... */
/* note, video types should only ever be set from this
Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-11-22
07:40:01 UTC (rev 42052)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c 2011-11-22
10:04:28 UTC (rev 42053)
@@ -2390,7 +2390,10 @@
RNA_def_property_flag(parm, PROP_REQUIRED|PROP_NEVER_NULL);
}
-/* use for render output and image save operator */
+/* use for render output and image save operator,
+ * note: there are some cases where the members act differently when this is
+ * used from a scene, video formats can only be selected for render output
+ * for example, this is checked by seeing if the ptr->id.data is a Scene id */
static void rna_def_scene_image_format_data(BlenderRNA *brna)
{
Modified: trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
2011-11-22 07:40:01 UTC (rev 42052)
+++ trunk/blender/source/blender/modifiers/intern/MOD_fluidsim_util.c
2011-11-22 10:04:28 UTC (rev 42053)
@@ -102,7 +102,7 @@
// fluid/inflow settings
// fss->iniVel --> automatically set to 0
- modifier_path_init(fss->surfdataPath,
sizeof(fss->surfdataPath), "fluid_cache");
+ modifier_path_init(fss->surfdataPath,
sizeof(fss->surfdataPath), "cache_fluid");
// first init of bounding box
// no bounding box needed
Modified: trunk/blender/source/blender/modifiers/intern/MOD_ocean.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_ocean.c 2011-11-22
07:40:01 UTC (rev 42052)
+++ trunk/blender/source/blender/modifiers/intern/MOD_ocean.c 2011-11-22
10:04:28 UTC (rev 42053)
@@ -127,7 +127,7 @@
omd->repeat_x = 1;
omd->repeat_y = 1;
- modifier_path_init(omd->cachepath, sizeof(omd->cachepath),
"ocean_cache");
+ modifier_path_init(omd->cachepath, sizeof(omd->cachepath),
"cache_ocean");
omd->cached = 0;
omd->bakestart = 1;
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
