[Bf-blender-cvs] [5f3b898638b] master: MSVC: Fix obscure RNA related build error

Ray Molenkamp noreply at git.blender.org
Mon Feb 17 19:05:01 CET 2020


Commit: 5f3b898638b2c306994e69c0ac6a26b8ac017448
Author: Ray Molenkamp
Date:   Mon Feb 17 11:04:55 2020 -0700
Branches: master
https://developer.blender.org/rB5f3b898638b2c306994e69c0ac6a26b8ac017448

MSVC: Fix obscure RNA related build error

When you switch between debug/release mode a lot, you could end up
in a situation where the generated RNA code was out of sync between
the two configurations.

There was one function optionally defined with an `#ifndef NDEBUG`
guard, this patch adds a stub implementation for the other configurations
to prevent build errors.

Differential Revision: https://developer.blender.org/D6855

Reviewers: brecht

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

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

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

diff --git a/source/blender/makesrna/intern/rna_object_api.c b/source/blender/makesrna/intern/rna_object_api.c
index d3c22098294..2acfd62fd03 100644
--- a/source/blender/makesrna/intern/rna_object_api.c
+++ b/source/blender/makesrna/intern/rna_object_api.c
@@ -687,6 +687,12 @@ void rna_Object_me_eval_info(
     }
   }
 }
+#  else
+void rna_Object_me_eval_info(
+    struct Object *ob, bContext *C, int type, PointerRNA *rnaptr_depsgraph, char *result)
+{
+  result[0] = '\0';
+}
 #  endif /* NDEBUG */
 
 static bool rna_Object_update_from_editmode(Object *ob, Main *bmain)



More information about the Bf-blender-cvs mailing list