[Bf-blender-cvs] [f828355cd6c] blender2.8: Avoid assert on startup
Campbell Barton
noreply at git.blender.org
Mon Jun 18 17:40:44 CEST 2018
Commit: f828355cd6ccea84ea699ee524ca56f9bdd2f997
Author: Campbell Barton
Date: Mon Jun 18 17:39:35 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf828355cd6ccea84ea699ee524ca56f9bdd2f997
Avoid assert on startup
===================================================================
M source/blender/editors/physics/particle_edit.c
===================================================================
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index a4225e86a6e..66369d989be 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4669,9 +4669,14 @@ void PE_create_particle_edit(
psys = NULL;
}
+ /* Causes assert on startup. */
+#if 0
UI_GetThemeColor3ubv(TH_EDGE_SELECT, edit->sel_col);
UI_GetThemeColor3ubv(TH_WIRE, edit->nosel_col);
-
+#else
+ memset(edit->sel_col, 0xff, sizeof(edit->sel_col));
+ memset(edit->nosel_col, 0x00, sizeof(edit->nosel_col));
+#endif
recalc_lengths(edit);
if (psys && !cache)
recalc_emitter_field(depsgraph, ob, psys);
More information about the Bf-blender-cvs
mailing list