Commit: 7b4fc58a2a7dc90a4e92d9de53e1977f5439142d
Author: Campbell Barton
Date: Fri Jun 8 08:23:46 2018 +0200
Branches: greasepencil-object
https://developer.blender.org/rB7b4fc58a2a7dc90a4e92d9de53e1977f5439142d
Fix macro argument use
===================================================================
M source/blender/draw/intern/draw_manager.c
M source/blender/makesrna/intern/rna_gpencil.c
===================================================================
diff --git a/source/blender/draw/intern/draw_manager.c
b/source/blender/draw/intern/draw_manager.c
index 7bf31d70f03..d8cdd541f5d 100644
--- a/source/blender/draw/intern/draw_manager.c
+++ b/source/blender/draw/intern/draw_manager.c
@@ -1465,7 +1465,7 @@ void DRW_draw_render_loop_offscreen(
/* helper to check if exit object type to render */
static bool DRW_render_check_object_type(struct Depsgraph *depsgraph, short
obtype)
{
- DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob,
DRW_iterator_mode_get())
+ DEG_OBJECT_ITER_FOR_RENDER_ENGINE_BEGIN(depsgraph, ob)
{
if ((ob->type == obtype) &&
(DRW_check_object_visible_within_active_context(ob))) {
return true;
diff --git a/source/blender/makesrna/intern/rna_gpencil.c
b/source/blender/makesrna/intern/rna_gpencil.c
index e91889378a7..1ae6b48f4b2 100644
--- a/source/blender/makesrna/intern/rna_gpencil.c
+++ b/source/blender/makesrna/intern/rna_gpencil.c
@@ -939,8 +939,6 @@ static void rna_def_gpencil_layer(BlenderRNA *brna)
PropertyRNA *prop;
FunctionRNA *func;
- static float onion_dft1[3] = { 0.145098f, 0.419608f, 0.137255f }; /*
green */
- static float onion_dft2[3] = { 0.125490f, 0.082353f, 0.529412f }; /*
blue */
srna = RNA_def_struct(brna, "GPencilLayer", NULL);
RNA_def_struct_sdna(srna, "bGPDlayer");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
