Revision: 27733
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27733
Author: broken
Date: 2010-03-25 01:10:41 +0100 (Thu, 25 Mar 2010)
Log Message:
-----------
Patch from Francois Tarlier: extend colour balance node 'lift' value to 0.0-2.0
range
(default 1.0), like the other controls. Thanks!
Modified Paths:
--------------
trunk/blender/source/blender/blenkernel/BKE_blender.h
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
Modified: trunk/blender/source/blender/blenkernel/BKE_blender.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_blender.h 2010-03-24
22:55:45 UTC (rev 27732)
+++ trunk/blender/source/blender/blenkernel/BKE_blender.h 2010-03-25
00:10:41 UTC (rev 27733)
@@ -45,7 +45,7 @@
struct Main;
#define BLENDER_VERSION 252
-#define BLENDER_SUBVERSION 0
+#define BLENDER_SUBVERSION 1
#define BLENDER_MINVERSION 250
#define BLENDER_MINSUBVERSION 0
Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c 2010-03-24
22:55:45 UTC (rev 27732)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c 2010-03-25
00:10:41 UTC (rev 27733)
@@ -3727,6 +3727,7 @@
FluidsimModifierData *fluidmd = (FluidsimModifierData*)
md;
fluidmd->fss= newdataadr(fd, fluidmd->fss);
+ fluidmd->fss->fmd= fluidmd;
fluidmd->fss->meshSurfNormals = 0;
}
else if (md->type==eModifierType_Smoke) {
@@ -10642,14 +10643,63 @@
} /* sequencer changes */
}
- /* put 2.50 compatibility code here until next subversion bump */
- {
+ if (main->versionfile < 252 || (main->versionfile == 252 &&
main->subversionfile < 1)) {
Brush *brush;
+ Object *ob;
+ Scene *scene;
+ bNodeTree *ntree;
for (brush= main->brush.first; brush; brush= brush->id.next) {
if (brush->curve) brush->curve->preset =
CURVE_PRESET_SMOOTH;
}
+
+ /* properly initialise active flag for fluidsim modifiers */
+ for(ob = main->object.first; ob; ob = ob->id.next) {
+ ModifierData *md;
+ for(md= ob->modifiers.first; md; md= md->next) {
+ if (md->type == eModifierType_Fluidsim) {
+ FluidsimModifierData *fmd =
(FluidsimModifierData *)md;
+ fmd->fss->flag |= OB_FLUIDSIM_ACTIVE;
+ }
+ }
+ }
+
+ /* adjustment to color balance node values */
+ for(scene= main->scene.first; scene; scene= scene->id.next) {
+ if(scene->nodetree) {
+ bNode *node=scene->nodetree->nodes.first;
+
+ while(node) {
+ if (node->type ==
CMP_NODE_COLORBALANCE) {
+ NodeColorBalance *n=
(NodeColorBalance *)node->storage;
+ n->lift[0] += 1.f;
+ n->lift[1] += 1.f;
+ n->lift[2] += 1.f;
+ }
+ node= node->next;
+ }
+ }
+ }
+ /* check inside node groups too */
+ for (ntree= main->nodetree.first; ntree; ntree=ntree->id.next) {
+ bNode *node=ntree->nodes.first;
+
+ while(node) {
+ if (node->type == CMP_NODE_COLORBALANCE) {
+ NodeColorBalance *n= (NodeColorBalance
*)node->storage;
+ n->lift[0] += 1.f;
+ n->lift[1] += 1.f;
+ n->lift[2] += 1.f;
+ }
+ node= node->next;
+ }
+ }
+
}
+ /* put 2.50 compatibility code here until next subversion bump */
+ {
+
+ }
/* WATCH IT!!!: pointers from libdata have not been converted yet here!
*/
/* WATCH IT 2!: Userdef struct init has to be in
editors/interface/resources.c! */
Modified: trunk/blender/source/blender/makesrna/intern/rna_nodetree.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2010-03-24
22:55:45 UTC (rev 27732)
+++ trunk/blender/source/blender/makesrna/intern/rna_nodetree.c 2010-03-25
00:10:41 UTC (rev 27733)
@@ -1927,7 +1927,8 @@
prop = RNA_def_property(srna, "lift", PROP_FLOAT, PROP_COLOR_GAMMA);
RNA_def_property_float_sdna(prop, NULL, "lift");
RNA_def_property_array(prop, 3);
- RNA_def_property_ui_range(prop, 0, 1, 0.1, 3);
+ RNA_def_property_float_array_default(prop, default_1);
+ RNA_def_property_ui_range(prop, 0, 2, 0.1, 3);
RNA_def_property_ui_text(prop, "Lift", "Correction for Shadows");
RNA_def_property_update(prop, NC_NODE|NA_EDITED, "rna_Node_update");
Modified: trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
===================================================================
--- trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
2010-03-24 22:55:45 UTC (rev 27732)
+++ trunk/blender/source/blender/nodes/intern/CMP_nodes/CMP_colorbalance.c
2010-03-25 00:10:41 UTC (rev 27733)
@@ -56,7 +56,7 @@
DO_INLINE float colorbalance_lgg(float in, float lift, float gamma, float gain)
{
- float x = gain*(in+lift*(1-in));
+ float x = gain*(in+(lift-1)*(1-in));
/* prevent NaN */
if (x < 0.f) x = 0.f;
@@ -150,7 +150,7 @@
{
NodeColorBalance *n= node->storage=
MEM_callocN(sizeof(NodeColorBalance), "node colorbalance");
- n->lift[0] = n->lift[1] = n->lift[2] = 0.0f;
+ n->lift[0] = n->lift[1] = n->lift[2] = 1.0f;
n->gamma[0] = n->gamma[1] = n->gamma[2] = 1.0f;
n->gain[0] = n->gain[1] = n->gain[2] = 1.0f;
}
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
