[Bf-blender-cvs] [78988e175ae] blender2.8: Fix T55915 DOF Number of blades wrong logic

[Clément Foucault]

Commit: 78988e175ae4904c043a6ca8499887b69c024c4f
Author: Clément Foucault
Date:   Wed Jul 11 18:33:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB78988e175ae4904c043a6ca8499887b69c024c4f

Fix T55915 DOF Number of blades wrong logic

Thanks @kostex for the fix.

===================================================================

M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 68b1f5a74aa..0c734a8e7c7 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1982,12 +1982,15 @@ static void rna_GPUDOFSettings_blades_set(PointerRNA *ptr, const int value)
 {
 	GPUDOFSettings *dofsettings = (GPUDOFSettings *)ptr->data;
 
-	if (value < 3 && dofsettings->num_blades > 2)
-		dofsettings->num_blades = 0;
-	else if (value > 0 && dofsettings->num_blades == 0)
-		dofsettings->num_blades = 3;
-	else
+	if (value == 1 || value == 2) {
+		if (dofsettings->num_blades == 0) {
+			dofsettings->num_blades = 3;
+		} else {
+			dofsettings->num_blades = 0;
+		}
+	} else {
 		dofsettings->num_blades = value;
+	}
 }
 
 static void rna_GPUDOFSettings_update(Main *UNUSED(bmain), Scene *scene, PointerRNA *UNUSED(ptr))