[Bf-blender-cvs] [4a84884e99] clay-engine: Fix warnings
Clément Foucault
noreply at git.blender.org
Fri Feb 3 14:53:48 CET 2017
Commit: 4a84884e9936dcba4c22b815828e29ed43cfafb0
Author: Clément Foucault
Date: Fri Feb 3 14:52:33 2017 +0100
Branches: clay-engine
https://developer.blender.org/rB4a84884e9936dcba4c22b815828e29ed43cfafb0
Fix warnings
===================================================================
M source/blender/makesrna/intern/rna_material.c
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_material.c b/source/blender/makesrna/intern/rna_material.c
index fd934fe468..4d3e3ffca2 100644
--- a/source/blender/makesrna/intern/rna_material.c
+++ b/source/blender/makesrna/intern/rna_material.c
@@ -315,8 +315,8 @@ static void rna_MaterialTextureSlot_use_set(PointerRNA *ptr, int value)
static StructRNA *rna_MaterialEngineSettings_refine(PointerRNA *ptr)
{
- MaterialEngineSettings *mes = (MaterialEngineSettings *)ptr->data;
#ifdef WITH_CLAY_ENGINE
+ MaterialEngineSettings *mes = (MaterialEngineSettings *)ptr->data;
if (STREQ(mes->name, RE_engine_id_BLENDER_CLAY)) {
return &RNA_MaterialEngineSettingsClay;
}
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 39d93648a6..08ac178383 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -1878,9 +1878,9 @@ static void rna_GameSettings_exit_key_set(PointerRNA *ptr, int value)
static StructRNA *rna_RenderEngineSettings_refine(PointerRNA *ptr)
{
+#ifdef WITH_CLAY_ENGINE
RenderEngineSettings *res = (RenderEngineSettings *)ptr->data;
-#ifdef WITH_CLAY_ENGINE
if (STREQ(res->name, RE_engine_id_BLENDER_CLAY)) {
return &RNA_RenderEngineSettingsClay;
}
More information about the Bf-blender-cvs
mailing list