Node socket values now only have soft limits, rather than hard limits, so you

[blender.git] / source / blender / makesrna / intern / rna_texture_api.c

diff --git a/source/blender/makesrna/intern/rna_texture_api.c b/source/blender/makesrna/intern/rna_texture_api.c
index bbadbd4f683d7cf09c835e8defaed9beb682f4dc..034696b43c5000f4f6464a56f4150e477135e826 100644 (file)
--- a/source/blender/makesrna/intern/rna_texture_api.c
+++ b/source/blender/makesrna/intern/rna_texture_api.c
@@ -1,12 +1,10 @@
 /*
 /*

- * $Id: rna_texture_api.c 39762 2011-08-28 23:44:43Z gsrb3d $
- *

  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * ***** BEGIN GPL LICENSE BLOCK *****
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2

- * of the License, or (at your option) any later version. 
+ * of the License, or (at your option) any later version.

  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of


@@ -45,13 +43,14 @@
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 
 #include "RE_pipeline.h"
 #include "RE_shader_ext.h"
 

-void save_envmap(struct EnvMap *env, bContext *C, ReportList *reports, const char* filepath, struct Scene *scene, float layout[12])
+void save_envmap(struct EnvMap *env, bContext *C, ReportList *reports, const char* filepath,
+                 struct Scene *scene, float layout[12])

 {
        if (scene == NULL) {
                scene = CTX_data_scene(C);
        }
 
 {
        if (scene == NULL) {
                scene = CTX_data_scene(C);
        }
 

-       RE_WriteEnvmapResult(reports, scene, env, filepath, scene->r.imtype, layout);
+       RE_WriteEnvmapResult(reports, scene, env, filepath, scene->r.im_format.imtype, layout);

 }
 
 void clear_envmap(struct EnvMap *env, bContext *C)
 }
 
 void clear_envmap(struct EnvMap *env, bContext *C)


@@ -61,16 +60,16 @@ void clear_envmap(struct EnvMap *env, bContext *C)
 
        BKE_free_envmapdata(env);
        
 
        BKE_free_envmapdata(env);
        

-       for (tex=bmain->tex.first; tex; tex=tex->id.next)
+       for (tex = bmain->tex.first; tex; tex = tex->id.next)

                if (tex->env == env) {
                        WM_event_add_notifier(C, NC_TEXTURE|NA_EDITED, tex);
                        break;
                }
 }
 
                if (tex->env == env) {
                        WM_event_add_notifier(C, NC_TEXTURE|NA_EDITED, tex);
                        break;
                }
 }
 

-void texture_evaluate(struct Tex *tex, float value[3], float color_r[3])
+void texture_evaluate(struct Tex *tex, float value[3], float color_r[4])

 {
 {

-       TexResult texres= {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};
+       TexResult texres = {0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0, NULL};

        multitex_ext(tex, value, NULL, NULL, 1, &texres);
 
        color_r[0] = texres.tr;
        multitex_ext(tex, value, NULL, NULL, 1, &texres);
 
        color_r[0] = texres.tr;


@@ -86,14 +85,14 @@ void RNA_api_texture(StructRNA *srna)
        FunctionRNA *func;
        PropertyRNA *parm;
 
        FunctionRNA *func;
        PropertyRNA *parm;
 

-       func= RNA_def_function(srna, "evaluate", "texture_evaluate");
+       func = RNA_def_function(srna, "evaluate", "texture_evaluate");

        RNA_def_function_ui_description(func, "Evaluate the texture at the coordinates given");
 
        RNA_def_function_ui_description(func, "Evaluate the texture at the coordinates given");
 

-       parm= RNA_def_float_vector(func, "value", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);
+       parm = RNA_def_float_vector(func, "value", 3, NULL, -FLT_MAX, FLT_MAX, "", "", -1e4, 1e4);

        RNA_def_property_flag(parm, PROP_REQUIRED);
 
        /* return location and normal */
        RNA_def_property_flag(parm, PROP_REQUIRED);
 
        /* return location and normal */

-       parm= RNA_def_float_vector(func, "result", 4, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4);
+       parm = RNA_def_float_vector(func, "result", 4, NULL, -FLT_MAX, FLT_MAX, "Result", NULL, -1e4, 1e4);

        RNA_def_property_flag(parm, PROP_THICK_WRAP);
        RNA_def_function_output(func, parm);
 
        RNA_def_property_flag(parm, PROP_THICK_WRAP);
        RNA_def_function_output(func, parm);
 


@@ -106,21 +105,24 @@ void RNA_api_environment_map(StructRNA *srna)
 
        static const float default_layout[] = { 0,0, 1,0, 2,0, 0,1, 1,1, 2,1 };
 
 
        static const float default_layout[] = { 0,0, 1,0, 2,0, 0,1, 1,1, 2,1 };
 

-       func= RNA_def_function(srna, "clear", "clear_envmap");
-       RNA_def_function_ui_description(func, "Discard the environment map and free it from memory.");
+       func = RNA_def_function(srna, "clear", "clear_envmap");
+       RNA_def_function_ui_description(func, "Discard the environment map and free it from memory");

        RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 
 
        RNA_def_function_flag(func, FUNC_USE_CONTEXT);
 
 

-       func= RNA_def_function(srna,"save", "save_envmap");
-       RNA_def_function_ui_description(func, "Save the environment map to disc using the scene render settings.");
+       func = RNA_def_function(srna,"save", "save_envmap");
+       RNA_def_function_ui_description(func, "Save the environment map to disc using the scene render settings");

        RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
 
        RNA_def_function_flag(func, FUNC_USE_CONTEXT|FUNC_USE_REPORTS);
 

-       parm= RNA_def_string_file_name(func,"filepath","",FILE_MAX,"File path","Location of the output file");
+       parm = RNA_def_string_file_name(func,"filepath","",FILE_MAX,"File path","Location of the output file");

        RNA_def_property_flag(parm, PROP_REQUIRED);
 
        RNA_def_property_flag(parm, PROP_REQUIRED);
 

-       RNA_def_pointer(func, "scene", "Scene", "", "Overrides the scene from which image parameters are taken.");
+       RNA_def_pointer(func, "scene", "Scene", "", "Overrides the scene from which image parameters are taken");

 
 

-       parm = RNA_def_float_array(func, "layout", 12, default_layout, 0.0f, 0.0f, "File layout", "Flat array describing the X,Y position of each cube face in the output image, where 1 is the size of a face. Order is [+Z -Z +Y -X -Y +X]. Use -1 to skip a face.", 0.0f, 0.0f);
+       RNA_def_float_array(func, "layout", 12, default_layout, 0.0f, 0.0f, "File layout",
+                           "Flat array describing the X,Y position of each cube face in the "
+                           "output image, where 1 is the size of a face - order is [+Z -Z +Y -X -Y +X] "
+                           "(use -1 to skip a face)", 0.0f, 0.0f);

 }
 
 #endif
 }
 
 #endif