[Bf-blender-cvs] [54443b6d900] soc-2018-npr: Fix merge errors.

Nick Wu noreply at git.blender.org
Sat Dec 8 15:56:00 CET 2018


Commit: 54443b6d900bd3ebd4dd848c0e2f94ba95f8cdad
Author: Nick Wu
Date:   Sat Dec 8 22:55:29 2018 +0800
Branches: soc-2018-npr
https://developer.blender.org/rB54443b6d900bd3ebd4dd848c0e2f94ba95f8cdad

Fix merge errors.

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

M	source/blender/draw/engines/lanpr/lanpr_ops.c
M	source/blender/makesrna/intern/rna_scene.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 28cd6374e11..b2cd913842f 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -3614,7 +3614,7 @@ void SCENE_OT_lanpr_delete_line_component(struct wmOperatorType *ot) {
 	RNA_def_int(ot->srna, "index", 0, 0, 10000, "index", "index of this line component", 0, 10000);
 }
 
-#ifdef 0
+#ifdef USE_LANPR_HINT
 
 // how to access LANPR's occlusion info after LANPR software mode calculation
 
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 659d312b234..04addd128c2 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2093,6 +2093,7 @@ static void rna_unit_system_update(Main *UNUSED(bmain), Scene *scene, PointerRNA
 static char *rna_UnitSettings_path(PointerRNA *UNUSED(ptr))
 {
 	return BLI_sprintfN("unit_settings");
+}
 
 /* lanpr */
 
@@ -6874,4 +6875,4 @@ void RNA_def_scene(BlenderRNA *brna)
 	RNA_api_scene(srna);
 }
 
-#endif
+#endif
\ No newline at end of file



More information about the Bf-blender-cvs mailing list